156 files changed, 50808 insertions, 2378 deletions

diff --git a/README.MD b/README.MD
index f4ccee5..3fd7f95 100644
--- a/README.MD
+++ b/README.MD
@@ -1,50 +1,50 @@
-# Sparky - Inventory UI Service

-

-## Overview

-_Sparky_ is a service that interacts with AAI and provides users a UI to view and analyze AAI data. The main goal behind _Sparky_ is providing a more user friendly and clear view of AAI data.

-

-This document covers cloning, installing, and running the front end (FE) portion of _Sparky_.

-

-## Getting Started

-

-### Building the _Sparky_ UI

-

-#### Clone the _Sparky_ FE repository

-

-Repository name is sparky-fe

-

-#### Install required tools

-

-Install node.js, including the Node Package Manager (NPM). Installing latest should be fun, but if that is causing issues then v6.10.1 will work.

-

-Install python, v2.7.13

-

-#### Install required packages

-

-Navigate to the top level project directory and run:

-

-    > npm install

-

-#### Run or Build the Project

-

-To run the project:

-

-    > npm start

-

-By default the local instance of the UI will be served to "https://localhost:8001/aai/#/viewInspect".

-

-This can be configured in the file "webpack.devConfig.js".

-

-To build the project (generates a .war file):

-

-    > gulp build

-    

-The build will create a directory called "dist" and add the "aai.war" file into said dist directory.

-

-If changes to the build flow are required, updating "webpack.config.js" and "gulpfile.js" will likely provide any build tuning required.

-

-## Dependencies

-

-_Sparky_ UI requires:

-

-- _Sparky_ instance that will serve the UI
\ No newline at end of file
+# Sparky - Inventory UI Service
+
+## Overview
+_Sparky_ is a service that interacts with AAI and provides users a UI to view and analyze AAI data. The main goal behind _Sparky_ is providing a more user friendly and clear view of AAI data.
+
+This document covers cloning, installing, and running the front end (FE) portion of _Sparky_.
+
+## Getting Started
+
+### Building the _Sparky_ UI
+
+#### Clone the _Sparky_ FE repository
+
+Repository name is sparky-fe
+
+#### Install required tools
+
+Install node.js, including the Node Package Manager (NPM). Installing latest should be fun, but if that is causing issues then v6.10.1 will work.
+
+Install python, v2.7.13
+
+#### Install required packages
+
+Navigate to the top level project directory and run:
+
+    > npm install
+
+#### Run or Build the Project
+
+To run the project:
+
+    > npm start
+
+By default the local instance of the UI will be served to "https://localhost:8001/aai/#/browse".
+
+This can be configured in the file "webpack.devConfig.js".
+
+To build the project (generates a .war file):
+
+    > gulp build
+    
+The build will create a directory called "dist" and add the "aai.war" file into said dist directory.
+
+If changes to the build flow are required, updating "webpack.config.js" and "gulpfile.js" will likely provide any build tuning required.
+
+## Dependencies
+
+_Sparky_ UI requires:
+
+- _Sparky_ instance that will serve the UI
diff --git a/package-lock.json b/package-lock.json
index 677fc2a..35feb37 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,65 +5,207 @@
   "requires": true,
   "dependencies": {
     "@babel/code-frame": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-      "dev": true,
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
       "requires": {
         "@babel/highlight": "^7.10.4"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.0.0-beta.32",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.32.tgz",
-      "integrity": "sha512-9jxfqCBrwCIa0p5ZIy1sakzKKm8x8tn0C52qpPr0M0WJ/k9gpD4ilS/mTV2v0tgmw4agjYdUXQ8slq51/5oOzQ==",
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz",
+      "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==",
       "requires": {
-        "@babel/types": "7.0.0-beta.32",
-        "lodash": "^4.2.0"
+        "@babel/types": "^7.12.5"
       }
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
-      "dev": true
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw=="
     },
     "@babel/highlight": {
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
       "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-      "dev": true,
       "requires": {
         "@babel/helper-validator-identifier": "^7.10.4",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "@babel/runtime": {
-      "version": "7.11.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
-      "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==",
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
+      "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
       "requires": {
         "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "@babel/runtime-corejs2": {
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.12.5.tgz",
+      "integrity": "sha512-kt5YpZ7F5A05LOgQuaMXXmcxakK/qttf5C/E1BJPA3Kf5PanbjPzDoXN+PIslUnjUxpuKblCsXyP0QfMiqyKqA==",
+      "requires": {
+        "core-js": "^2.6.5",
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "@babel/types": {
+      "version": "7.12.12",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz",
+      "integrity": "sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==",
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "lodash": "^4.17.19",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@emotion/babel-utils": {
+      "version": "0.6.10",
+      "resolved": "https://registry.npmjs.org/@emotion/babel-utils/-/babel-utils-0.6.10.tgz",
+      "integrity": "sha512-/fnkM/LTEp3jKe++T0KyTszVGWNKPNOUJfjNKLO17BzQ6QPxgbg3whayom1Qr2oLFH3V92tDymU+dT5q676uow==",
+      "requires": {
+        "@emotion/hash": "^0.6.6",
+        "@emotion/memoize": "^0.6.6",
+        "@emotion/serialize": "^0.9.1",
+        "convert-source-map": "^1.5.1",
+        "find-root": "^1.1.0",
+        "source-map": "^0.7.2"
       },
       "dependencies": {
-        "regenerator-runtime": {
-          "version": "0.13.7",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-          "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
+        "@emotion/hash": {
+          "version": "0.6.6",
+          "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.6.6.tgz",
+          "integrity": "sha512-ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ=="
+        },
+        "@emotion/memoize": {
+          "version": "0.6.6",
+          "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.6.6.tgz",
+          "integrity": "sha512-h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ=="
+        },
+        "@emotion/serialize": {
+          "version": "0.9.1",
+          "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.9.1.tgz",
+          "integrity": "sha512-zTuAFtyPvCctHBEL8KZ5lJuwBanGSutFEncqLn/m9T1a6a93smBStK+bZzcNPgj4QS8Rkw9VTwJGhRIUVO8zsQ==",
+          "requires": {
+            "@emotion/hash": "^0.6.6",
+            "@emotion/memoize": "^0.6.6",
+            "@emotion/unitless": "^0.6.7",
+            "@emotion/utils": "^0.8.2"
+          }
+        },
+        "@emotion/unitless": {
+          "version": "0.6.7",
+          "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.6.7.tgz",
+          "integrity": "sha512-Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg=="
+        },
+        "@emotion/utils": {
+          "version": "0.8.2",
+          "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.8.2.tgz",
+          "integrity": "sha512-rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw=="
+        },
+        "source-map": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
         }
       }
     },
-    "@babel/types": {
-      "version": "7.0.0-beta.32",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.32.tgz",
-      "integrity": "sha512-w8+wzVcYCMb9OfaBfay2Vg5hyj7UfBX6qQtA+kB0qsW1h1NH/7xHMwvTZNqkuFBwjz5wxGS2QmaIcC3HH+UoxA==",
+    "@emotion/cache": {
+      "version": "10.0.29",
+      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz",
+      "integrity": "sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ==",
       "requires": {
-        "esutils": "^2.0.2",
-        "lodash": "^4.2.0",
-        "to-fast-properties": "^2.0.0"
+        "@emotion/sheet": "0.9.4",
+        "@emotion/stylis": "0.8.5",
+        "@emotion/utils": "0.11.3",
+        "@emotion/weak-memoize": "0.2.5"
+      }
+    },
+    "@emotion/hash": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
+      "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
+    },
+    "@emotion/memoize": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
+      "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="
+    },
+    "@emotion/serialize": {
+      "version": "0.11.16",
+      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.16.tgz",
+      "integrity": "sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg==",
+      "requires": {
+        "@emotion/hash": "0.8.0",
+        "@emotion/memoize": "0.7.4",
+        "@emotion/unitless": "0.7.5",
+        "@emotion/utils": "0.11.3",
+        "csstype": "^2.5.7"
+      },
+      "dependencies": {
+        "csstype": {
+          "version": "2.6.14",
+          "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.14.tgz",
+          "integrity": "sha512-2mSc+VEpGPblzAxyeR+vZhJKgYg0Og0nnRi7pmRXFYYxSfnOnW8A5wwQb4n4cE2nIOzqKOAzLCaEX6aBmNEv8A=="
+        }
       }
     },
+    "@emotion/sheet": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-0.9.4.tgz",
+      "integrity": "sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA=="
+    },
+    "@emotion/stylis": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
+      "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="
+    },
+    "@emotion/unitless": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
+      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
+    },
+    "@emotion/utils": {
+      "version": "0.11.3",
+      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz",
+      "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw=="
+    },
+    "@emotion/weak-memoize": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz",
+      "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA=="
+    },
     "@gulp-sourcemaps/map-sources": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
@@ -72,12 +214,23 @@
       "requires": {
         "normalize-path": "^2.0.1",
         "through2": "^2.0.3"
+      },
+      "dependencies": {
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "dev": true,
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
+        }
       }
     },
     "@sinonjs/commons": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz",
-      "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz",
+      "integrity": "sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==",
       "requires": {
         "type-detect": "4.0.8"
       }
@@ -106,22 +259,30 @@
       "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz",
       "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ=="
     },
-    "@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-      "dev": true
+    "@types/cheerio": {
+      "version": "0.22.23",
+      "resolved": "https://registry.npmjs.org/@types/cheerio/-/cheerio-0.22.23.tgz",
+      "integrity": "sha512-QfHLujVMlGqcS/ePSf3Oe5hK3H8wi/yN2JYuxSB1U10VvW1fO3K8C+mURQesFYS1Hn7lspOsTT75SKq/XtydQg==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
     },
     "@types/node": {
-      "version": "14.6.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.6.0.tgz",
-      "integrity": "sha512-mikldZQitV94akrc4sCcSjtJfsTKt4p+e/s0AGscVA6XArQ9kFclP+ZiYUMnq987rc6QlYxXv/EivqlfSLxpKA==",
+      "version": "14.14.20",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz",
+      "integrity": "sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==",
       "dev": true
     },
+    "@types/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
+    },
     "abab": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.4.tgz",
-      "integrity": "sha512-Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
+      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
       "dev": true
     },
     "abbrev": {
@@ -178,12 +339,6 @@
             "wordwrap": "0.0.2"
           }
         },
-        "lodash.defaults": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-          "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
-          "dev": true
-        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -238,9 +393,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
+          "version": "6.4.2",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+          "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
           "dev": true
         }
       }
@@ -278,7 +433,6 @@
       "version": "2.16.0",
       "resolved": "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz",
       "integrity": "sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg==",
-      "dev": true,
       "requires": {
         "array.prototype.find": "^2.1.1",
         "function.prototype.name": "^1.1.2",
@@ -292,9 +446,9 @@
       }
     },
     "ajv": {
-      "version": "6.12.4",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
-      "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "requires": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -343,6 +497,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
       "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
       "requires": {
         "ansi-wrap": "^0.1.0"
       }
@@ -366,7 +521,6 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
       "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
-      "dev": true,
       "requires": {
         "ansi-wrap": "0.1.0"
       }
@@ -386,12 +540,9 @@
       "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
     },
     "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
     },
     "ansi-wrap": {
       "version": "0.1.0",
@@ -412,6 +563,17 @@
       "requires": {
         "micromatch": "^2.1.5",
         "normalize-path": "^2.0.0"
+      },
+      "dependencies": {
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "dev": true,
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
+        }
       }
     },
     "append-transform": {
@@ -447,6 +609,53 @@
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
       "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
     },
+    "archiver": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-3.1.1.tgz",
+      "integrity": "sha512-5Hxxcig7gw5Jod/8Gq0OneVgLYET+oNHcxgWItq4TbhOzRLKNAFUb9edAftiMKXvXfCB0vbGrJdZDNq0dWMsxg==",
+      "requires": {
+        "archiver-utils": "^2.1.0",
+        "async": "^2.6.3",
+        "buffer-crc32": "^0.2.1",
+        "glob": "^7.1.4",
+        "readable-stream": "^3.4.0",
+        "tar-stream": "^2.1.0",
+        "zip-stream": "^2.1.2"
+      }
+    },
+    "archiver-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz",
+      "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==",
+      "requires": {
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.2.0",
+        "lazystream": "^1.0.0",
+        "lodash.defaults": "^4.2.0",
+        "lodash.difference": "^4.5.0",
+        "lodash.flatten": "^4.4.0",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.union": "^4.6.0",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^2.0.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
+      }
+    },
     "archy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
@@ -460,6 +669,22 @@
       "requires": {
         "delegates": "^1.0.0",
         "readable-stream": "^2.0.6"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
       }
     },
     "argparse": {
@@ -470,10 +695,23 @@
         "sprintf-js": "~1.0.2"
       }
     },
+    "arguments-extended": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/arguments-extended/-/arguments-extended-0.0.3.tgz",
+      "integrity": "sha1-YQfkkX0OtvCk3WYyD8Fa/HLvSUY=",
+      "requires": {
+        "extended": "~0.0.3",
+        "is-extended": "~0.0.8"
+      }
+    },
     "arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "^1.0.1"
+      }
     },
     "arr-flatten": {
       "version": "1.1.0",
@@ -484,13 +722,13 @@
     "arr-union": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
     },
     "array-differ": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-      "dev": true
+      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE="
     },
     "array-each": {
       "version": "1.0.1",
@@ -504,6 +742,16 @@
       "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
       "dev": true
     },
+    "array-extended": {
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/array-extended/-/array-extended-0.0.11.tgz",
+      "integrity": "sha1-1xRK50jek8pybxIQCdv/FibRZL0=",
+      "requires": {
+        "arguments-extended": "~0.0.3",
+        "extended": "~0.0.3",
+        "is-extended": "~0.0.3"
+      }
+    },
     "array-filter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz",
@@ -544,8 +792,7 @@
     "array-uniq": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
     },
     "array-unique": {
       "version": "0.2.1",
@@ -557,20 +804,42 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.1.tgz",
       "integrity": "sha512-mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA==",
-      "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
         "es-abstract": "^1.17.4"
       }
     },
     "array.prototype.flat": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
-      "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz",
+      "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0-next.1",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+          "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-negative-zero": "^2.0.0",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "arraybuffer.slice": {
@@ -639,7 +908,8 @@
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true
     },
     "ast-traverse": {
       "version": "0.1.1",
@@ -660,10 +930,12 @@
       "dev": true
     },
     "async": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-      "dev": true
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "requires": {
+        "lodash": "^4.17.14"
+      }
     },
     "async-each": {
       "version": "1.0.3",
@@ -719,9 +991,9 @@
       "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz",
-      "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
     },
     "axios": {
       "version": "0.18.1",
@@ -752,12 +1024,6 @@
         "source-map": "^0.5.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
         "babel-core": {
           "version": "5.8.38",
           "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.38.tgz",
@@ -824,19 +1090,6 @@
           "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=",
           "dev": true
         },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
         "core-js": {
           "version": "1.2.7",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
@@ -960,21 +1213,6 @@
             }
           }
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        },
         "to-fast-properties": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
@@ -1000,45 +1238,11 @@
         "js-tokens": "^3.0.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
         "js-tokens": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
           "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
           "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
         }
       }
     },
@@ -1301,13 +1505,13 @@
       }
     },
     "babel-jest": {
-      "version": "22.4.4",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-22.4.4.tgz",
-      "integrity": "sha512-A9NB6/lZhYyypR9ATryOSDcqBaqNdzq4U+CN+/wcMsLcmKkPxQEoTKLajGfd3IkxNyVBT8NewUK2nWyGbSzHEQ==",
+      "version": "23.6.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-23.6.0.tgz",
+      "integrity": "sha512-lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew==",
       "dev": true,
       "requires": {
-        "babel-plugin-istanbul": "^4.1.5",
-        "babel-preset-jest": "^22.4.4"
+        "babel-plugin-istanbul": "^4.1.6",
+        "babel-preset-jest": "^23.2.0"
       }
     },
     "babel-loader": {
@@ -1360,6 +1564,27 @@
       "integrity": "sha512-/GIwkOeNHQU9R27Bkt0jHrJgaXBX5KLKrIH5h/iGebvKppvL9e4wKCgrl4qwUj0qssBHQFeSavk3lG2lQgdq8w==",
       "requires": {
         "cosmiconfig": "3.1.0"
+      },
+      "dependencies": {
+        "cosmiconfig": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-3.1.0.tgz",
+          "integrity": "sha512-zedsBhLSbPBms+kE7AH4vHg6JsKDz6epSv2/+5XHs8ILHlgDciSJfSWf8sX9aQ52Jb7KI7VswUTsLpR/G0cr2Q==",
+          "requires": {
+            "is-directory": "^0.3.1",
+            "js-yaml": "^3.9.0",
+            "parse-json": "^3.0.0",
+            "require-from-string": "^2.0.1"
+          }
+        },
+        "parse-json": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-3.0.0.tgz",
+          "integrity": "sha1-+m9HsY4jgm6tMvJj50TQ4ehH+xM=",
+          "requires": {
+            "error-ex": "^1.3.1"
+          }
+        }
       }
     },
     "babel-messages": {
@@ -1393,18 +1618,20 @@
       "dev": true
     },
     "babel-plugin-emotion": {
-      "version": "8.0.12",
-      "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-8.0.12.tgz",
-      "integrity": "sha512-GVxl6Y86I2PPICtFqabf5qvcVc0MD8PJbLujJ9UV1tdC5QoKMe+dZD0DCpdTDEzlOJVwetMu7m+bg66NeGi49w==",
-      "requires": {
-        "@babel/helper-module-imports": "7.0.0-beta.32",
-        "babel-macros": "^1.2.0",
+      "version": "10.0.33",
+      "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.0.33.tgz",
+      "integrity": "sha512-bxZbTTGz0AJQDHm8k6Rf3RQJ8tX2scsfsRyKVgAbiUPUNIRtlK+7JxP+TAd1kRLABFxe0CFm2VdK4ePkoA9FxQ==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@emotion/hash": "0.8.0",
+        "@emotion/memoize": "0.7.4",
+        "@emotion/serialize": "^0.11.16",
+        "babel-plugin-macros": "^2.0.0",
         "babel-plugin-syntax-jsx": "^6.18.0",
         "convert-source-map": "^1.5.0",
-        "emotion-utils": "^8.0.12",
+        "escape-string-regexp": "^1.0.5",
         "find-root": "^1.1.0",
-        "source-map": "^0.5.7",
-        "touch": "^1.0.0"
+        "source-map": "^0.5.7"
       },
       "dependencies": {
         "source-map": {
@@ -1490,9 +1717,9 @@
       }
     },
     "babel-plugin-jest-hoist": {
-      "version": "22.4.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.4.tgz",
-      "integrity": "sha512-DUvGfYaAIlkdnygVIEl0O4Av69NtuQWcrjMOv6DODPuhuGLDnbsARz3AwiiI/EkIMMlxQDUcrZ9yoyJvTNjcVQ==",
+      "version": "23.2.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz",
+      "integrity": "sha1-5h+uBaHKiAGq3uV6bWa4zvr0QWc=",
       "dev": true
     },
     "babel-plugin-jscript": {
@@ -1501,6 +1728,29 @@
       "integrity": "sha1-jzQsOCduh6R9X6CovT1etsytj8w=",
       "dev": true
     },
+    "babel-plugin-lodash": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz",
+      "integrity": "sha512-yDZLjK7TCkWl1gpBeBGmuaDIFhZKmkoL+Cu2MUUjv5VxUZx/z7tBGBCBcQs5RI1Bkz5LLmNdjx7paOyQtMovyg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0-beta.49",
+        "@babel/types": "^7.0.0-beta.49",
+        "glob": "^7.1.1",
+        "lodash": "^4.17.10",
+        "require-package-name": "^2.0.1"
+      }
+    },
+    "babel-plugin-macros": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz",
+      "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==",
+      "requires": {
+        "@babel/runtime": "^7.7.2",
+        "cosmiconfig": "^6.0.0",
+        "resolve": "^1.12.0"
+      }
+    },
     "babel-plugin-member-expression-literals": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-member-expression-literals/-/babel-plugin-member-expression-literals-1.0.1.tgz",
@@ -2069,6 +2319,25 @@
       "integrity": "sha1-f1eO+LeN+uYAM4XYQXph7aBuL4E=",
       "dev": true
     },
+    "babel-polyfill": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
+      "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "core-js": "^2.5.0",
+        "regenerator-runtime": "^0.10.5"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.10.5",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
+          "dev": true
+        }
+      }
+    },
     "babel-preset-es2015": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
@@ -2111,12 +2380,12 @@
       }
     },
     "babel-preset-jest": {
-      "version": "22.4.4",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-22.4.4.tgz",
-      "integrity": "sha512-+dxMtOFwnSYWfum0NaEc0O03oSdwBsjx4tMSChRDPGwu/4wSY6Q6ANW3wkjKpJzzguaovRs/DODcT4hbSN8yiA==",
+      "version": "23.2.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz",
+      "integrity": "sha1-jsegOhOPABoaj7HoETZSvxpV2kY=",
       "dev": true,
       "requires": {
-        "babel-plugin-jest-hoist": "^22.4.4",
+        "babel-plugin-jest-hoist": "^23.2.0",
         "babel-plugin-syntax-object-rest-spread": "^6.13.0"
       }
     },
@@ -2200,9 +2469,18 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
       "requires": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+          "dev": true
+        }
       }
     },
     "babel-template": {
@@ -2336,6 +2614,12 @@
             "kind-of": "^6.0.2"
           }
         },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
         "kind-of": {
           "version": "6.0.3",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -2351,16 +2635,15 @@
       "dev": true
     },
     "base64-arraybuffer": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
-      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz",
+      "integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=",
       "dev": true
     },
     "base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
-      "dev": true
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
     "base64id": {
       "version": "1.0.0",
@@ -2385,8 +2668,7 @@
     "beeper": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
-      "dev": true
+      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak="
     },
     "better-assert": {
       "version": "1.0.2",
@@ -2407,13 +2689,35 @@
         "check-types": "^8.0.3",
         "hoopy": "^0.1.4",
         "tryer": "^1.0.1"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.7.2",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+          "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+          "dev": true
+        }
       }
     },
+    "big-integer": {
+      "version": "1.6.48",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz",
+      "integrity": "sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w=="
+    },
     "big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
     },
+    "binary": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+      "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
+      "requires": {
+        "buffers": "~0.1.1",
+        "chainsaw": "~0.1.0"
+      }
+    },
     "binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
@@ -2436,6 +2740,16 @@
         "file-uri-to-path": "1.0.0"
       }
     },
+    "bl": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
+      "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==",
+      "requires": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
     "blob": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
@@ -2451,10 +2765,9 @@
       }
     },
     "bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
+      "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM="
     },
     "body-parser": {
       "version": "1.19.0",
@@ -2508,11 +2821,28 @@
       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
       "dev": true,
-      "optional": true,
       "requires": {
         "hoek": "2.x.x"
       }
     },
+    "bootstrap": {
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.3.tgz",
+      "integrity": "sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ=="
+    },
+    "bootstrap-slider": {
+      "version": "10.6.2",
+      "resolved": "https://registry.npmjs.org/bootstrap-slider/-/bootstrap-slider-10.6.2.tgz",
+      "integrity": "sha512-8JTPZB9QVOdrGzYF3YgC3YW6ssfPeBvBwZnXffiZ7YH/zz1D0EKlZvmQsm/w3N0XjVNYQEoQ0ax+jHrErV4K1Q=="
+    },
+    "bootstrap-switch-button-react": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/bootstrap-switch-button-react/-/bootstrap-switch-button-react-1.2.0.tgz",
+      "integrity": "sha512-p/l+Rp69VtXpK0Y2PR9XYE1TPuypxF+1CpBPmvLUpwXjCisuxtl2S8AF6PqeLDxizFeHuW5nUE6qnqrZY/9ZQA==",
+      "requires": {
+        "react": "^16.11.0"
+      }
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -2562,14 +2892,20 @@
         }
       }
     },
+    "browser-stdout": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
+      "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
+      "dev": true
+    },
     "browser-sync": {
-      "version": "2.26.12",
-      "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.26.12.tgz",
-      "integrity": "sha512-1GjAe+EpZQJgtKhWsxklEjpaMV0DrRylpHRvZWgOphDQt+bfLZjfynl/j1WjSFIx8ozj9j78g6Yk4TqD3gKaMA==",
+      "version": "2.26.13",
+      "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.26.13.tgz",
+      "integrity": "sha512-JPYLTngIzI+Dzx+StSSlMtF+Q9yjdh58HW6bMFqkFXuzQkJL8FCvp4lozlS6BbECZcsM2Gmlgp0uhEjvl18X4w==",
       "dev": true,
       "requires": {
-        "browser-sync-client": "^2.26.12",
-        "browser-sync-ui": "^2.26.12",
+        "browser-sync-client": "^2.26.13",
+        "browser-sync-ui": "^2.26.13",
         "bs-recipes": "1.3.4",
         "bs-snippet-injector": "^2.0.1",
         "chokidar": "^3.4.1",
@@ -2577,7 +2913,7 @@
         "connect-history-api-fallback": "^1",
         "dev-ip": "^1.0.1",
         "easy-extender": "^2.3.4",
-        "eazy-logger": "^3",
+        "eazy-logger": "3.1.0",
         "etag": "^1.8.1",
         "fresh": "^0.5.2",
         "fs-extra": "3.0.1",
@@ -2607,12 +2943,11 @@
           "dev": true
         },
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -2627,9 +2962,9 @@
           }
         },
         "binary-extensions": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
-          "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+          "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
           "dev": true
         },
         "braces": {
@@ -2648,19 +2983,19 @@
           "dev": true
         },
         "chokidar": {
-          "version": "3.4.2",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
-          "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.0.tgz",
+          "integrity": "sha512-JgQM9JS92ZbFR4P90EvmzNpSGhpPBGBSj10PILeDyYFwp4h2/D9OM03wsJ4zW1fEp4ka2DGrnUeD7FuvQ2aZ2Q==",
           "dev": true,
           "requires": {
             "anymatch": "~3.1.1",
             "braces": "~3.0.2",
-            "fsevents": "~2.1.2",
+            "fsevents": "~2.3.1",
             "glob-parent": "~5.1.0",
             "is-binary-path": "~2.1.0",
             "is-glob": "~4.0.1",
             "normalize-path": "~3.0.0",
-            "readdirp": "~3.4.0"
+            "readdirp": "~3.5.0"
           }
         },
         "cliui": {
@@ -2730,9 +3065,9 @@
           }
         },
         "fsevents": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz",
+          "integrity": "sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==",
           "dev": true,
           "optional": true
         },
@@ -2824,12 +3159,6 @@
           "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
           "dev": true
         },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
-        },
         "p-locate": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
@@ -2852,9 +3181,9 @@
           "dev": true
         },
         "readdirp": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-          "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+          "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
           "dev": true,
           "requires": {
             "picomatch": "^2.2.1"
@@ -2977,9 +3306,9 @@
       }
     },
     "browser-sync-client": {
-      "version": "2.26.12",
-      "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.26.12.tgz",
-      "integrity": "sha512-bEBDRkufKxrIfjOsIB1FN9itUEXr2oLtz1AySgSSr80K2AWzmtoYnxtVASx/i40qFrSdeI31pNvdCjHivihLVA==",
+      "version": "2.26.13",
+      "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.26.13.tgz",
+      "integrity": "sha512-p2VbZoYrpuDhkreq+/Sv1MkToHklh7T1OaIntDwpG6Iy2q/XkBcgwPcWjX+WwRNiZjN8MEehxIjEUh12LweLmQ==",
       "dev": true,
       "requires": {
         "etag": "1.8.1",
@@ -2989,9 +3318,9 @@
       }
     },
     "browser-sync-ui": {
-      "version": "2.26.12",
-      "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.26.12.tgz",
-      "integrity": "sha512-PkAJNf/TfCFTCkQUfXplR2Kp/+/lbCWFO9lrgLZsmxIhvMLx2pYZFBbTBIaem8qjXhld9ZcESUC8EdU5VWFJgQ==",
+      "version": "2.26.13",
+      "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.26.13.tgz",
+      "integrity": "sha512-6NJ/pCnhCnBMzaty1opWo7ipDmFAIk8U71JMQGKJxblCUaGfdsbF2shf6XNZSkXYia1yS0vwKu9LIOzpXqQZCA==",
       "dev": true,
       "requires": {
         "async-each-series": "0.1.1",
@@ -3018,6 +3347,14 @@
       "dev": true,
       "requires": {
         "pako": "~0.2.0"
+      },
+      "dependencies": {
+        "pako": {
+          "version": "0.2.9",
+          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+          "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
+          "dev": true
+        }
       }
     },
     "browserslist": {
@@ -3052,14 +3389,12 @@
       }
     },
     "buffer": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-      "dev": true,
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
       "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
       }
     },
     "buffer-alloc": {
@@ -3081,8 +3416,7 @@
     "buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
     },
     "buffer-fill": {
       "version": "1.0.0",
@@ -3096,6 +3430,16 @@
       "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
       "dev": true
     },
+    "buffer-indexof-polyfill": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",
+      "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A=="
+    },
+    "buffers": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+      "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s="
+    },
     "bufferstreams": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.3.tgz",
@@ -3103,8 +3447,31 @@
       "dev": true,
       "requires": {
         "readable-stream": "^2.0.2"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
       }
     },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "dev": true
+    },
     "builtin-status-codes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
@@ -3136,6 +3503,14 @@
         "ssri": "^5.2.4",
         "unique-filename": "^1.1.0",
         "y18n": "^4.0.0"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.7.2",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+          "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+          "dev": true
+        }
       }
     },
     "cache-base": {
@@ -3153,6 +3528,23 @@
         "to-object-path": "^0.3.0",
         "union-value": "^1.0.0",
         "unset-value": "^1.0.0"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
+    },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
       }
     },
     "caller-path": {
@@ -3162,6 +3554,14 @@
       "dev": true,
       "requires": {
         "callsites": "^0.2.0"
+      },
+      "dependencies": {
+        "callsites": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+          "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
+          "dev": true
+        }
       }
     },
     "callsite": {
@@ -3171,10 +3571,9 @@
       "dev": true
     },
     "callsites": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
-      "dev": true
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
     },
     "camel-case": {
       "version": "1.2.2",
@@ -3213,9 +3612,9 @@
       }
     },
     "caniuse-db": {
-      "version": "1.0.30001116",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001116.tgz",
-      "integrity": "sha512-v7zj0MenYwLid3ENDLNlTMBOoIQdWYcShqnXbZZuuaq11xnn2y9DfL5VtZhiIb9PInT3sWpP11GVjmC8hPFBcA==",
+      "version": "1.0.30001177",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001177.tgz",
+      "integrity": "sha512-bu5ZkVbh3c1i17W/AtuQ2O16jeDKIS8aTtAW1x+b+nYBWLb6x0lMrHfSHXuD+0eJnuKUBYFsZW4BlmvGoT0KgA==",
       "dev": true
     },
     "capture-exit": {
@@ -3271,14 +3670,30 @@
         }
       }
     },
+    "chai-immutable": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/chai-immutable/-/chai-immutable-1.6.0.tgz",
+      "integrity": "sha1-nsAL3WeUixOyD8u4nL9K8s5vkkc=",
+      "dev": true
+    },
+    "chainsaw": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+      "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
+      "requires": {
+        "traverse": ">=0.3.0 <0.4"
+      }
+    },
     "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
       "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
       }
     },
     "change-case": {
@@ -3322,17 +3737,31 @@
       "dev": true
     },
     "cheerio": {
-      "version": "1.0.0-rc.3",
-      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz",
-      "integrity": "sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==",
+      "version": "1.0.0-rc.5",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.5.tgz",
+      "integrity": "sha512-yoqps/VCaZgN4pfXtenwHROTp8NG6/Hlt4Jpz2FEP0ZJQ+ZUkVDd0hAPDNKhj3nakpfPt/CNs57yEtxD1bXQiw==",
+      "dev": true,
+      "requires": {
+        "cheerio-select-tmp": "^0.1.0",
+        "dom-serializer": "~1.2.0",
+        "domhandler": "^4.0.0",
+        "entities": "~2.1.0",
+        "htmlparser2": "^6.0.0",
+        "parse5": "^6.0.0",
+        "parse5-htmlparser2-tree-adapter": "^6.0.0"
+      }
+    },
+    "cheerio-select-tmp": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/cheerio-select-tmp/-/cheerio-select-tmp-0.1.1.tgz",
+      "integrity": "sha512-YYs5JvbpU19VYJyj+F7oYrIE2BOll1/hRU7rEy/5+v9BzkSo3bK81iAeeQEMI92vRIxz677m72UmJUiVwwgjfQ==",
       "dev": true,
       "requires": {
-        "css-select": "~1.2.0",
-        "dom-serializer": "~0.1.1",
-        "entities": "~1.1.1",
-        "htmlparser2": "^3.9.1",
-        "lodash": "^4.15.0",
-        "parse5": "^3.0.1"
+        "css-select": "^3.1.2",
+        "css-what": "^4.0.0",
+        "domelementtype": "^2.1.0",
+        "domhandler": "^4.0.0",
+        "domutils": "^2.4.4"
       }
     },
     "chokidar": {
@@ -3383,42 +3812,6 @@
       "dev": true,
       "requires": {
         "chalk": "^1.1.3"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
       }
     },
     "class-utils": {
@@ -3441,6 +3834,12 @@
           "requires": {
             "is-descriptor": "^0.1.0"
           }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
         }
       }
     },
@@ -3470,6 +3869,15 @@
         }
       }
     },
+    "clean-webpack-plugin": {
+      "version": "0.1.19",
+      "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-0.1.19.tgz",
+      "integrity": "sha512-M1Li5yLHECcN2MahoreuODul5LkjohJGFxLPTjl3j1ttKrF5rgjZET1SJduuqxLAuT1gAPOdkhg03qcaaU1KeA==",
+      "dev": true,
+      "requires": {
+        "rimraf": "^2.6.1"
+      }
+    },
     "cli-cursor": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
@@ -3480,19 +3888,81 @@
       }
     },
     "cli-table": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
-      "integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.4.tgz",
+      "integrity": "sha512-1vinpnX/ZERcmE443i3SZTmU5DF0rPO9DrL4I2iVAllhxzCM9SzPlHnz19fsZB78htkKZvYBvj6SZ6vXnaxmTA==",
       "dev": true,
       "requires": {
-        "colors": "1.0.3"
+        "chalk": "^2.4.1",
+        "string-width": "^4.2.0"
       },
       "dependencies": {
-        "colors": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-          "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
           "dev": true
+        },
+        "string-width": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
@@ -3555,8 +4025,7 @@
     "clone": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-      "dev": true
+      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
     },
     "clone-buffer": {
       "version": "1.0.0",
@@ -3567,8 +4036,7 @@
     "clone-stats": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-      "dev": true
+      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE="
     },
     "cloneable-readable": {
       "version": "1.1.3",
@@ -3579,6 +4047,23 @@
         "inherits": "^2.0.1",
         "process-nextick-args": "^2.0.0",
         "readable-stream": "^2.3.5"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
       }
     },
     "co": {
@@ -3617,6 +4102,18 @@
         "react-dom": "^16.4.2",
         "react-select": "^1.2.1",
         "url-loader": "^0.5.9"
+      },
+      "dependencies": {
+        "react-select": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/react-select/-/react-select-1.3.0.tgz",
+          "integrity": "sha512-g/QAU1HZrzSfxkwMAo/wzi6/ezdWye302RGZevsATec07hI/iSxcpB1hejFIp7V63DJ8mwuign6KmB3VjdlinQ==",
+          "requires": {
+            "classnames": "^2.2.4",
+            "prop-types": "^15.5.8",
+            "react-input-autosize": "^2.1.2"
+          }
+        }
       }
     },
     "collection-visit": {
@@ -3665,8 +4162,7 @@
     "color-support": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "dev": true
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="
     },
     "colormin": {
       "version": "1.1.2",
@@ -3778,6 +4274,33 @@
       "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
       "dev": true
     },
+    "compress-commons": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-2.1.1.tgz",
+      "integrity": "sha512-eVw6n7CnEMFzc3duyFVrQEuY1BlHR3rYsSztyG32ibGMW722i3C6IizEGMFmfMU+A+fALvBIwxN3czffTcdA+Q==",
+      "requires": {
+        "buffer-crc32": "^0.2.13",
+        "crc32-stream": "^3.0.1",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^2.3.6"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
+      }
+    },
     "compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
@@ -3834,6 +4357,23 @@
         "inherits": "^2.0.3",
         "readable-stream": "^2.2.2",
         "typedarray": "^0.0.6"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
       }
     },
     "concat-with-sourcemaps": {
@@ -3930,6 +4470,12 @@
       "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
       "dev": true
     },
+    "contains-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
+      "dev": true
+    },
     "content-disposition": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
@@ -4088,9 +4634,9 @@
       }
     },
     "core-js": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-      "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
     },
     "core-util-is": {
       "version": "1.0.2",
@@ -4098,32 +4644,68 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-3.1.0.tgz",
-      "integrity": "sha512-zedsBhLSbPBms+kE7AH4vHg6JsKDz6epSv2/+5XHs8ILHlgDciSJfSWf8sX9aQ52Jb7KI7VswUTsLpR/G0cr2Q==",
-      "requires": {
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.9.0",
-        "parse-json": "^3.0.0",
-        "require-from-string": "^2.0.1"
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
+      "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+      "requires": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.1.0",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.7.2"
       },
       "dependencies": {
         "parse-json": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-3.0.0.tgz",
-          "integrity": "sha1-+m9HsY4jgm6tMvJj50TQ4ehH+xM=",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz",
+          "integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==",
           "requires": {
-            "error-ex": "^1.3.1"
+            "@babel/code-frame": "^7.0.0",
+            "error-ex": "^1.3.1",
+            "json-parse-even-better-errors": "^2.3.0",
+            "lines-and-columns": "^1.1.6"
           }
+        },
+        "path-type": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+          "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
         }
       }
     },
+    "crc": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz",
+      "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==",
+      "requires": {
+        "buffer": "^5.1.0"
+      }
+    },
+    "crc32-stream": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-3.0.1.tgz",
+      "integrity": "sha512-mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w==",
+      "requires": {
+        "crc": "^3.4.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "create-emotion": {
+      "version": "10.0.27",
+      "resolved": "https://registry.npmjs.org/create-emotion/-/create-emotion-10.0.27.tgz",
+      "integrity": "sha512-fIK73w82HPPn/RsAij7+Zt8eCE8SptcJ3WoRMfxMtjteYxud8GDTKKld7MYwAX2TVhrw29uR1N/bVGxeStHILg==",
+      "requires": {
+        "@emotion/cache": "^10.0.27",
+        "@emotion/serialize": "^0.11.15",
+        "@emotion/sheet": "0.9.4",
+        "@emotion/utils": "0.11.3"
+      }
+    },
     "create-react-class": {
-      "version": "15.6.3",
-      "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.3.tgz",
-      "integrity": "sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==",
+      "version": "15.7.0",
+      "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.7.0.tgz",
+      "integrity": "sha512-QZv4sFWG9S5RUvkTYWbflxeZX+JG7Cz0Tn33rQBJ+WFQTqTfUTjMjiv9tnfXazjsO5r0KhPs+AqCjyrQX6h2ng==",
       "requires": {
-        "fbjs": "^0.8.9",
         "loose-envify": "^1.3.1",
         "object-assign": "^4.1.1"
       }
@@ -4256,12 +4838,13 @@
       "dev": true
     },
     "css-loader": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.23.1.tgz",
-      "integrity": "sha1-n6I/K1wJZSNZEK1ezvO4o2OQ/lA=",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.25.0.tgz",
+      "integrity": "sha1-w/68jOKPTINXa2sTcH9H+Qw5AiM=",
       "dev": true,
       "requires": {
-        "css-selector-tokenizer": "^0.5.1",
+        "babel-code-frame": "^6.11.0",
+        "css-selector-tokenizer": "^0.6.0",
         "cssnano": ">=2.6.1 <4",
         "loader-utils": "~0.2.2",
         "lodash.camelcase": "^3.0.1",
@@ -4307,31 +4890,46 @@
       }
     },
     "css-select": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
-      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-3.1.2.tgz",
+      "integrity": "sha512-qmss1EihSuBNWNNhHjxzxSfJoFBM/lERB/Q4EnsJQQC62R2evJDW481091oAdOr9uh46/0n4nrg0It5cAnj1RA==",
       "dev": true,
       "requires": {
-        "boolbase": "~1.0.0",
-        "css-what": "2.1",
-        "domutils": "1.5.1",
-        "nth-check": "~1.0.1"
+        "boolbase": "^1.0.0",
+        "css-what": "^4.0.0",
+        "domhandler": "^4.0.0",
+        "domutils": "^2.4.3",
+        "nth-check": "^2.0.0"
       }
     },
     "css-selector-tokenizer": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.5.4.tgz",
-      "integrity": "sha1-E5uv00o1/QwUKEhwSeBpnm9qLCE=",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz",
+      "integrity": "sha1-ZEX1gseTDSQdzFAHpD1vy48HMVI=",
       "dev": true,
       "requires": {
         "cssesc": "^0.1.0",
-        "fastparse": "^1.1.1"
+        "fastparse": "^1.1.1",
+        "regexpu-core": "^1.0.0"
+      },
+      "dependencies": {
+        "regexpu-core": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
+          "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
+          "dev": true,
+          "requires": {
+            "regenerate": "^1.2.1",
+            "regjsgen": "^0.2.0",
+            "regjsparser": "^0.1.4"
+          }
+        }
       }
     },
     "css-what": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
-      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-4.0.0.tgz",
+      "integrity": "sha512-teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A==",
       "dev": true
     },
     "cssesc": {
@@ -4413,6 +5011,11 @@
         "cssom": "0.3.x"
       }
     },
+    "csstype": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.6.tgz",
+      "integrity": "sha512-+ZAmfyWMT7TiIlzdqJgjMb7S4f1beorDbWbsocyK4RaiqA5RTX3K14bnBWmmA9QEM0gRdsjyyrEmcyga8Zsxmw=="
+    },
     "currently-unhandled": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
@@ -4648,6 +5251,15 @@
       "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.3.0.tgz",
       "integrity": "sha512-qgpUOg9tl5CirdqESUAu0t9MU/t3O9klYfGfyKsXEmhyxyzLpzpeh08gaxBUTQw1uXIOkr/30Ut2YRjSSxlmHA=="
     },
+    "d3-selection-multi": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d3-selection-multi/-/d3-selection-multi-1.0.1.tgz",
+      "integrity": "sha1-zWwlQT0EosuXRw54byzYd/PjT1g=",
+      "requires": {
+        "d3-selection": "1",
+        "d3-transition": "1"
+      }
+    },
     "d3-shape": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.2.0.tgz",
@@ -4736,11 +5348,20 @@
         }
       }
     },
+    "date-extended": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/date-extended/-/date-extended-0.0.6.tgz",
+      "integrity": "sha1-I4AtV90b94GIE/4MMuhRqG2iZ8k=",
+      "requires": {
+        "array-extended": "~0.0.3",
+        "extended": "~0.0.3",
+        "is-extended": "~0.0.3"
+      }
+    },
     "dateformat": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
-      "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
-      "dev": true
+      "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI="
     },
     "deap": {
       "version": "1.0.1",
@@ -4790,9 +5411,14 @@
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
     "decimal.js-light": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.0.tgz",
-      "integrity": "sha512-b3VJCbd2hwUpeRGG3Toob+CRo8W22xplipNhP3tN7TSVB/cyMX71P1vM2Xjc9H74uV6dS2hDDmo/rHq8L87Upg=="
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.1.tgz",
+      "integrity": "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg=="
+    },
+    "declare.js": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/declare.js/-/declare.js-0.0.8.tgz",
+      "integrity": "sha1-BHit/5VkwAT1Hfc9i8E0AZ0o3N4="
     },
     "decode-uri-component": {
       "version": "0.2.0",
@@ -4931,6 +5557,12 @@
             "kind-of": "^6.0.2"
           }
         },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
         "kind-of": {
           "version": "6.0.3",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -4987,9 +5619,9 @@
           "dev": true
         },
         "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+          "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
           "dev": true
         },
         "yargs": {
@@ -5146,6 +5778,12 @@
       "integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=",
       "dev": true
     },
+    "dlv": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
+      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
+      "dev": true
+    },
     "doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
@@ -5155,6 +5793,15 @@
         "esutils": "^2.0.2"
       }
     },
+    "dom-converter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+      "dev": true,
+      "requires": {
+        "utila": "~0.4"
+      }
+    },
     "dom-helpers": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
@@ -5176,20 +5823,20 @@
       }
     },
     "dom-serializer": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
-      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz",
+      "integrity": "sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==",
       "dev": true,
       "requires": {
-        "domelementtype": "^1.3.0",
-        "entities": "^1.1.1"
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.0.0",
+        "entities": "^2.0.0"
       }
     },
     "dom-walk": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
-      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
-      "dev": true
+      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
     },
     "domain-browser": {
       "version": "1.2.0",
@@ -5198,9 +5845,9 @@
       "dev": true
     },
     "domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz",
+      "integrity": "sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==",
       "dev": true
     },
     "domexception": {
@@ -5213,22 +5860,23 @@
       }
     },
     "domhandler": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz",
+      "integrity": "sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==",
       "dev": true,
       "requires": {
-        "domelementtype": "1"
+        "domelementtype": "^2.1.0"
       }
     },
     "domutils": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.4.4.tgz",
+      "integrity": "sha512-jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA==",
       "dev": true,
       "requires": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.0.0"
       }
     },
     "dot-case": {
@@ -5247,37 +5895,26 @@
       "dev": true
     },
     "duplexer2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-      "dev": true,
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
       "requires": {
-        "readable-stream": "~1.1.9"
+        "readable-stream": "^2.0.2"
       },
       "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
         "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-          "dev": true,
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
           "requires": {
             "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
         }
       }
     },
@@ -5291,6 +5928,23 @@
         "inherits": "^2.0.1",
         "readable-stream": "^2.0.0",
         "stream-shift": "^1.0.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
       }
     },
     "easy-extender": {
@@ -5303,12 +5957,12 @@
       }
     },
     "eazy-logger": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/eazy-logger/-/eazy-logger-3.0.2.tgz",
-      "integrity": "sha1-oyWqXlPROiIliJsqxBE7K5Y29Pw=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/eazy-logger/-/eazy-logger-3.1.0.tgz",
+      "integrity": "sha512-/snsn2JqBtUSSstEl4R0RKjkisGHAhvYj89i7r3ytNUKW12y178KDZwXLXIgwDqLW6E/VRMT9qfld7wvFae8bQ==",
       "dev": true,
       "requires": {
-        "tfunk": "^3.0.1"
+        "tfunk": "^4.0.0"
       }
     },
     "ecc-jsbn": {
@@ -5333,9 +5987,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.538",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.538.tgz",
-      "integrity": "sha512-rlyYXLlOoZkJuvY4AJXUpP7CHRVtwZz311HPVoEO1UHo/kqDCsP1pNas0A9paZuPEiYGdLwrjllF2hs69NEaTw==",
+      "version": "1.3.639",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.639.tgz",
+      "integrity": "sha512-bwl6/U6xb3d3CNufQU9QeO1L32ueouFwW4bWANSwdXR7LVqyLzWjNbynoKNfuC38QFB5Qn7O0l2KLqBkcXnC3Q==",
       "dev": true
     },
     "emoji-regex": {
@@ -5349,14 +6003,12 @@
       "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
     },
     "emotion": {
-      "version": "8.0.12",
-      "resolved": "https://registry.npmjs.org/emotion/-/emotion-8.0.12.tgz",
-      "integrity": "sha512-WwPA6wrFo/Rwkcmn3ptO8Bpjob1lgRtBl4KJxagfQ+ExwnIryql3JNNwQX6TvJvlLxQm5ByrG71PZbKode1hpw==",
+      "version": "10.0.27",
+      "resolved": "https://registry.npmjs.org/emotion/-/emotion-10.0.27.tgz",
+      "integrity": "sha512-2xdDzdWWzue8R8lu4G76uWX5WhyQuzATon9LmNeCy/2BHVC6dsEpfhN1a0qhELgtDVdjyEA6J8Y/VlI5ZnaH0g==",
       "requires": {
-        "babel-plugin-emotion": "^8.0.12",
-        "emotion-utils": "^8.0.12",
-        "stylis": "^3.3.2",
-        "stylis-rule-sheet": "^0.0.5"
+        "babel-plugin-emotion": "^10.0.27",
+        "create-emotion": "^10.0.27"
       }
     },
     "emotion-utils": {
@@ -5392,7 +6044,6 @@
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
       "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
       "requires": {
         "once": "^1.4.0"
       }
@@ -5411,6 +6062,12 @@
         "ws": "~3.3.1"
       },
       "dependencies": {
+        "base64-arraybuffer": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+          "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
+          "dev": true
+        },
         "cookie": {
           "version": "0.3.1",
           "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
@@ -5444,50 +6101,33 @@
       }
     },
     "engine.io-client": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.3.tgz",
-      "integrity": "sha512-0NGY+9hioejTEJCaSJZfWZLk4FPI9dN+1H1C4+wj2iuFba47UgZbJzfWs4aNFajnX/qAaYKbe2lLTfEEWzCmcw==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.0.tgz",
+      "integrity": "sha512-12wPRfMrugVw/DNyJk34GQ5vIVArEcVMXWugQGGuw2XxUSztFNmJggZmv8IZlLyEdnpO1QB9LkcjeWewO2vxtA==",
       "dev": true,
       "requires": {
         "component-emitter": "~1.3.0",
         "component-inherit": "0.0.3",
-        "debug": "~4.1.0",
+        "debug": "~3.1.0",
         "engine.io-parser": "~2.2.0",
         "has-cors": "1.1.0",
         "indexof": "0.0.1",
-        "parseqs": "0.0.5",
-        "parseuri": "0.0.5",
-        "ws": "~6.1.0",
+        "parseqs": "0.0.6",
+        "parseuri": "0.0.6",
+        "ws": "~7.4.2",
         "xmlhttprequest-ssl": "~1.5.4",
         "yeast": "0.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "engine.io-parser": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.0.tgz",
-      "integrity": "sha512-6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.1.tgz",
+      "integrity": "sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==",
       "dev": true,
       "requires": {
         "after": "0.8.2",
         "arraybuffer.slice": "~0.0.7",
-        "base64-arraybuffer": "0.1.5",
+        "base64-arraybuffer": "0.1.4",
         "blob": "0.0.5",
         "has-binary2": "~1.0.2"
       }
@@ -5508,6 +6148,12 @@
           "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
           "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
           "dev": true
+        },
+        "tapable": {
+          "version": "0.1.10",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+          "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
+          "dev": true
         }
       }
     },
@@ -5518,9 +6164,9 @@
       "dev": true
     },
     "entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
       "dev": true
     },
     "enzyme": {
@@ -5551,13 +6197,20 @@
         "raf": "^3.4.1",
         "rst-selector-parser": "^2.2.3",
         "string.prototype.trim": "^1.2.1"
+      },
+      "dependencies": {
+        "lodash.escape": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz",
+          "integrity": "sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=",
+          "dev": true
+        }
       }
     },
     "enzyme-adapter-react-16": {
-      "version": "1.15.3",
-      "resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.3.tgz",
-      "integrity": "sha512-98rqNI4n9HZslWIPuuwy4hK1bxRuMy+XX0CU1dS8iUqcgisTxeBaap6oPp2r4MWC8OphCbbqAT8EU/xHz3zIaQ==",
-      "dev": true,
+      "version": "1.15.5",
+      "resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.5.tgz",
+      "integrity": "sha512-33yUJGT1nHFQlbVI5qdo5Pfqvu/h4qPwi1o0a6ZZsjpiqq92a3HjynDhwd1IeED+Su60HDWV8mxJqkTnLYdGkw==",
       "requires": {
         "enzyme-adapter-utils": "^1.13.1",
         "enzyme-shallow-equal": "^1.0.4",
@@ -5571,15 +6224,15 @@
       }
     },
     "enzyme-adapter-utils": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.1.tgz",
-      "integrity": "sha512-5A9MXXgmh/Tkvee3bL/9RCAAgleHqFnsurTYCbymecO4ohvtNO5zqIhHxV370t7nJAwaCfkgtffarKpC0GPt0g==",
-      "dev": true,
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.0.tgz",
+      "integrity": "sha512-F/z/7SeLt+reKFcb7597IThpDp0bmzcH1E9Oabqv+o01cID2/YInlqHbFl7HzWBl4h3OdZYedtwNDOmSKkk0bg==",
       "requires": {
         "airbnb-prop-types": "^2.16.0",
-        "function.prototype.name": "^1.1.2",
-        "object.assign": "^4.1.0",
-        "object.fromentries": "^2.0.2",
+        "function.prototype.name": "^1.1.3",
+        "has": "^1.0.3",
+        "object.assign": "^4.1.2",
+        "object.fromentries": "^2.0.3",
         "prop-types": "^15.7.2",
         "semver": "^5.7.1"
       }
@@ -5604,26 +6257,26 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz",
       "integrity": "sha512-MttIwB8kKxypwHvRynuC3ahyNc+cFbR8mjVIltnmzQ0uKGqmsfO4bfBuLxb0beLNPhjblUEYvEbsg+VSygvF1Q==",
-      "dev": true,
       "requires": {
         "has": "^1.0.3",
         "object-is": "^1.1.2"
       }
     },
     "enzyme-to-json": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/enzyme-to-json/-/enzyme-to-json-3.5.0.tgz",
-      "integrity": "sha512-clusXRsiaQhG7+wtyc4t7MU8N3zCOgf4eY9+CeSenYzKlFST4lxerfOvnWd4SNaToKhkuba+w6m242YpQOS7eA==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/enzyme-to-json/-/enzyme-to-json-3.6.1.tgz",
+      "integrity": "sha512-15tXuONeq5ORoZjV/bUo2gbtZrN2IH+Z6DvL35QmZyKHgbY1ahn6wcnLd9Xv9OjiwbAXiiP8MRZwbZrCv1wYNg==",
       "dev": true,
       "requires": {
+        "@types/cheerio": "^0.22.22",
         "lodash": "^4.17.15",
         "react-is": "^16.12.0"
       }
     },
     "errno": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
       "dev": true,
       "requires": {
         "prr": "~1.0.1"
@@ -5641,36 +6294,36 @@
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-1.3.6.tgz",
       "integrity": "sha1-4Oc7k+QXE40c18C3RrGkoUhUwpI=",
-      "dev": true,
       "requires": {
         "stackframe": "^0.3.1"
       }
     },
     "es-abstract": {
-      "version": "1.17.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
       "requires": {
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
         "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.0",
-        "is-regex": "^1.1.0",
-        "object-inspect": "^1.7.0",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
+        "object.assign": "^4.1.1",
         "string.prototype.trimend": "^1.0.1",
         "string.prototype.trimstart": "^1.0.1"
       }
     },
     "es-get-iterator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.0.tgz",
-      "integrity": "sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.1.tgz",
+      "integrity": "sha512-qorBw8Y7B15DVLaJWy6WdEV/ZkieBcu6QCq/xzWzGOKJqgG1j754vXRfZ3NY7HSShneqU43mPB4OkQBTkvHhFw==",
       "dev": true,
       "requires": {
-        "es-abstract": "^1.17.4",
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.1",
         "has-symbols": "^1.0.1",
         "is-arguments": "^1.0.4",
         "is-map": "^2.0.1",
@@ -5800,6 +6453,12 @@
         "es6-symbol": "^3.1.1"
       }
     },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
+    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -5903,25 +6562,6 @@
         "user-home": "^2.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -5931,26 +6571,33 @@
             "ms": "2.0.0"
           }
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
         "strip-bom": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
           "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
           "dev": true
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
+        }
+      }
+    },
+    "eslint-import-resolver-node": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.2.3.tgz",
+      "integrity": "sha1-Wt2BBujJKNssuiMrzZ76hG49oWw=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.2.0",
+        "object-assign": "^4.0.1",
+        "resolve": "^1.1.6"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
         }
       }
     },
@@ -5968,44 +6615,71 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-0.8.1.tgz",
-      "integrity": "sha1-weB2CX2RPL39WPHRT0kgXYozpzU=",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-1.16.0.tgz",
+      "integrity": "sha1-svoH68xTUE0PKkR3WC7Iv/GHG58=",
       "dev": true,
       "requires": {
-        "babel-runtime": "5.8.19",
-        "espree": "^2.0.1",
-        "resolve": "^1.1.6"
+        "builtin-modules": "^1.1.1",
+        "contains-path": "^0.1.0",
+        "debug": "^2.2.0",
+        "doctrine": "1.3.x",
+        "es6-map": "^0.1.3",
+        "es6-set": "^0.1.4",
+        "eslint-import-resolver-node": "^0.2.0",
+        "has": "^1.0.1",
+        "lodash.cond": "^4.3.0",
+        "lodash.endswith": "^4.0.1",
+        "lodash.find": "^4.3.0",
+        "lodash.findindex": "^4.3.0",
+        "minimatch": "^3.0.3",
+        "object-assign": "^4.0.1",
+        "pkg-dir": "^1.0.0",
+        "pkg-up": "^1.0.0"
       },
       "dependencies": {
-        "babel-runtime": {
-          "version": "5.8.19",
-          "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.19.tgz",
-          "integrity": "sha1-Be46r2fm1KOfG8DwdZiya5zrTT4=",
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
-            "core-js": "^0.9.0"
+            "ms": "2.0.0"
           }
         },
-        "core-js": {
-          "version": "0.9.18",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-0.9.18.tgz",
-          "integrity": "sha1-E/RY5DAjKw9OwfSA2nwvUojp0JU=",
-          "dev": true
-        },
-        "espree": {
-          "version": "2.2.5",
-          "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz",
-          "integrity": "sha1-32kbkxCIlAKuspzAZnCMVmkLhUs=",
-          "dev": true
+        "doctrine": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.3.0.tgz",
+          "integrity": "sha1-E+dWgrVVGEJCdvfBc3g0Vu+RPSY=",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "isarray": "^1.0.0"
+          }
         }
       }
     },
     "eslint-plugin-react": {
-      "version": "3.16.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-3.16.1.tgz",
-      "integrity": "sha1-Ji2Wt318SkKvgJpzwOUnpYYSKTw=",
-      "dev": true
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-5.2.2.tgz",
+      "integrity": "sha1-fbBo4fVIf2hx5N7vNqOBwwPqwWE=",
+      "dev": true,
+      "requires": {
+        "doctrine": "^1.2.2",
+        "jsx-ast-utils": "^1.2.1"
+      },
+      "dependencies": {
+        "doctrine": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "isarray": "^1.0.0"
+          }
+        }
+      }
     },
     "esniff": {
       "version": "1.1.0",
@@ -6050,12 +6724,20 @@
       }
     },
     "esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
       "requires": {
-        "estraverse": "^4.1.0"
+        "estraverse": "^5.2.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "dev": true
+        }
       }
     },
     "estraverse": {
@@ -6086,9 +6768,9 @@
       }
     },
     "eventemitter3": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
-      "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
       "dev": true
     },
     "events": {
@@ -6106,6 +6788,21 @@
         "original": "^1.0.0"
       }
     },
+    "exceljs": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/exceljs/-/exceljs-1.15.0.tgz",
+      "integrity": "sha512-72CySYLU1oBIixpBkWV0mR6YM+X8v2GyyWgKBovS9Hso0Ul7S3FtlWGeAifxB+lpzznokWMRDLMZ8EyS2tX6xg==",
+      "requires": {
+        "archiver": "^3.0.0",
+        "fast-csv": "^2.4.1",
+        "jszip": "^3.1.5",
+        "moment": "^2.22.2",
+        "promish": "^5.1.1",
+        "sax": "^1.2.4",
+        "tmp": "^0.1.0",
+        "unzipper": "^0.9.12"
+      }
+    },
     "exec-sh": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
@@ -6332,9 +7029,9 @@
       },
       "dependencies": {
         "type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
-          "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==",
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz",
+          "integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==",
           "dev": true
         }
       }
@@ -6348,9 +7045,37 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
       "requires": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "extended": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/extended/-/extended-0.0.6.tgz",
+      "integrity": "sha1-f7i/e52uOXWG5IVwrP1kLHjlBmk=",
+      "requires": {
+        "extender": "~0.0.5"
+      }
+    },
+    "extender": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/extender/-/extender-0.0.10.tgz",
+      "integrity": "sha1-WJwHSCvmGhRgttgfnCSqZ+jzJM0=",
+      "requires": {
+        "declare.js": "~0.0.4"
       }
     },
     "extglob": {
@@ -6377,7 +7102,6 @@
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
       "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
-      "dev": true,
       "requires": {
         "ansi-gray": "^0.1.1",
         "color-support": "^1.1.3",
@@ -6385,6 +7109,18 @@
         "time-stamp": "^1.0.0"
       }
     },
+    "fast-csv": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/fast-csv/-/fast-csv-2.5.0.tgz",
+      "integrity": "sha512-M/9ezLU9/uDwvDZTt9sNFJa0iLDUsbhYJwPtnE0D9MjeuB6DY9wRCyUPZta9iI6cSz5wBWGaUPL61QH8h92cNA==",
+      "requires": {
+        "extended": "0.0.6",
+        "is-extended": "0.0.10",
+        "object-extended": "0.0.7",
+        "safer-buffer": "^2.1.2",
+        "string-extended": "0.0.8"
+      }
+    },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -6478,44 +7214,13 @@
       }
     },
     "file-loader": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.8.5.tgz",
-      "integrity": "sha1-knXQMf54DyfUf19K8CvUNxPMFRs=",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.6.tgz",
+      "integrity": "sha512-873ztuL+/hfvXbLDJ262PGO6XjERnybJu2gW1/5j8HUfxSiFJI9Hj/DhZ50ZGRUxBvuNiazb/cM2rh9pqrxP6Q==",
       "dev": true,
       "requires": {
-        "loader-utils": "~0.2.5"
-      },
-      "dependencies": {
-        "big.js": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-          "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
-          "dev": true
-        },
-        "emojis-list": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-          "dev": true
-        },
-        "json5": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-          "dev": true
-        },
-        "loader-utils": {
-          "version": "0.2.17",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
-          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
-          "dev": true,
-          "requires": {
-            "big.js": "^3.1.3",
-            "emojis-list": "^2.0.0",
-            "json5": "^0.5.0",
-            "object-assign": "^4.0.1"
-          }
-        }
+        "loader-utils": "^1.0.2",
+        "schema-utils": "^0.3.0"
       }
     },
     "file-uri-to-path": {
@@ -6558,17 +7263,6 @@
         "randomatic": "^3.0.0",
         "repeat-element": "^1.1.2",
         "repeat-string": "^1.5.2"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-          "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-          "dev": true,
-          "requires": {
-            "isarray": "1.0.0"
-          }
-        }
       }
     },
     "filter-bar-utils": {
@@ -6645,6 +7339,12 @@
         "resolve-dir": "^1.0.1"
       },
       "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -6875,12 +7575,6 @@
             "kind-of": "^6.0.2"
           }
         },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
         "is-extglob": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -6916,6 +7610,12 @@
             }
           }
         },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
         "kind-of": {
           "version": "6.0.3",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -7007,6 +7707,23 @@
       "requires": {
         "inherits": "^2.0.3",
         "readable-stream": "^2.3.6"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
       }
     },
     "follow-redirects": {
@@ -7076,8 +7793,30 @@
       "requires": {
         "inherits": "^2.0.1",
         "readable-stream": "^2.0.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
       }
     },
+    "fs": {
+      "version": "0.0.1-security",
+      "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz",
+      "integrity": "sha1-invTcYa23d84E/I4WLV+yq9eQdQ="
+    },
     "fs-access": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
@@ -7087,6 +7826,11 @@
         "null-check": "^1.0.0"
       }
     },
+    "fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+    },
     "fs-extra": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
@@ -7114,6 +7858,23 @@
         "iferr": "^0.1.5",
         "imurmurhash": "^0.1.4",
         "readable-stream": "1 || 2"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
       }
     },
     "fs.realpath": {
@@ -7149,21 +7910,41 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "function.prototype.name": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.2.tgz",
-      "integrity": "sha512-C8A+LlHBJjB2AdcRPorc5JvJ5VUoWlXdEHLOJdCI7kjHEtGTpHQUiqMvCIKUwIsGwZX2jZJy761AXsn356bJQg==",
-      "dev": true,
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.3.tgz",
+      "integrity": "sha512-H51qkbNSp8mtkJt+nyW1gyStBiKZxfRqySNUR99ylq6BPXHKI4SEvIlTKp4odLfjRKJV04DFWMU3G/YRlQOsag==",
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "functions-have-names": "^1.2.0"
+        "es-abstract": "^1.18.0-next.1",
+        "functions-have-names": "^1.2.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0-next.1",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+          "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-negative-zero": "^2.0.0",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "functions-have-names": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.1.tgz",
-      "integrity": "sha512-j48B/ZI7VKs3sgeI2cZp7WXWmZXu7Iq5pl5/vptV5N2mq+DGFuS/ulaDjtaoLpYzuD6u8UgrUKHfgo7fDTSiBA==",
-      "dev": true
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.2.tgz",
+      "integrity": "sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA=="
     },
     "gauge": {
       "version": "2.7.4",
@@ -7178,16 +7959,6 @@
         "string-width": "^1.0.1",
         "strip-ansi": "^3.0.1",
         "wide-align": "^1.1.0"
-      },
-      "dependencies": {
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        }
       }
     },
     "gaze": {
@@ -7221,6 +7992,16 @@
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
     },
+    "get-intrinsic": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz",
+      "integrity": "sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      }
+    },
     "get-stdin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
@@ -7459,7 +8240,6 @@
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
       "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
-      "dev": true,
       "requires": {
         "min-document": "^2.19.0",
         "process": "^0.11.10"
@@ -7531,7 +8311,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
       "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
-      "dev": true,
       "requires": {
         "sparkles": "^1.0.0"
       }
@@ -7585,45 +8364,11 @@
         "vinyl-fs": "^0.3.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
         "semver": {
           "version": "4.3.6",
           "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
           "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
           "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
         }
       }
     },
@@ -7641,12 +8386,6 @@
         "vinyl-sourcemaps-apply": "^0.2.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
         "babel-core": {
           "version": "5.8.38",
           "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.38.tgz",
@@ -7713,19 +8452,6 @@
           "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=",
           "dev": true
         },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
         "core-js": {
           "version": "1.2.7",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
@@ -7810,12 +8536,6 @@
             "is-finite": "^1.0.0"
           }
         },
-        "replace-ext": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-          "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-          "dev": true
-        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -7842,21 +8562,6 @@
             }
           }
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        },
         "to-fast-properties": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
@@ -7879,14 +8584,6 @@
       "requires": {
         "lodash.defaults": "^4.2.0",
         "through2": "^2.0.1"
-      },
-      "dependencies": {
-        "lodash.defaults": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-          "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
-          "dev": true
-        }
       }
     },
     "gulp-changed": {
@@ -8005,6 +8702,16 @@
           "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=",
           "dev": true
         },
+        "lodash.defaults": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
+          "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=",
+          "dev": true,
+          "requires": {
+            "lodash._objecttypes": "~2.4.1",
+            "lodash.keys": "~2.4.1"
+          }
+        },
         "lodash.escape": {
           "version": "2.4.1",
           "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
@@ -8171,10 +8878,16 @@
           "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
           "dev": true
         },
+        "replace-ext": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+          "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+          "dev": true
+        },
         "vinyl": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
-          "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
+          "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
           "dev": true,
           "requires": {
             "clone": "^2.1.1",
@@ -8216,10 +8929,16 @@
           "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
           "dev": true
         },
+        "replace-ext": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+          "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+          "dev": true
+        },
         "vinyl": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
-          "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
+          "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
           "dev": true,
           "requires": {
             "clone": "^2.1.1",
@@ -8244,25 +8963,6 @@
         "object-assign": "^4.1.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -8339,26 +9039,11 @@
           "integrity": "sha1-7GIRvtGSBEIIj+D3Cyg3Iy7SyKg=",
           "dev": true
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
         "strip-json-comments": {
           "version": "1.0.4",
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
           "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
           "dev": true
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
         }
       }
     },
@@ -8426,12 +9111,6 @@
         "vinyl-paths": "^2.1.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
         "babel-runtime": {
           "version": "5.8.38",
           "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.38.tgz",
@@ -8441,19 +9120,6 @@
             "core-js": "^1.0.0"
           }
         },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
         "core-js": {
           "version": "1.2.7",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
@@ -8508,21 +9174,6 @@
             "request": "^2.61.0",
             "sass-graph": "^2.1.1"
           }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
         }
       }
     },
@@ -8538,6 +9189,23 @@
         "object-assign": "^4.0.1",
         "readable-stream": "^2.0.2",
         "tryit": "^1.0.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
       }
     },
     "gulp-insert": {
@@ -8642,110 +9310,29 @@
       }
     },
     "gulp-jsx-coverage": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/gulp-jsx-coverage/-/gulp-jsx-coverage-0.3.8.tgz",
-      "integrity": "sha1-x3CY+5vi6W3K87gD+I32BWrUWhQ=",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/gulp-jsx-coverage/-/gulp-jsx-coverage-0.4.0.tgz",
+      "integrity": "sha1-/UvXbUuCmwlG6sn1T219NjesRg0=",
       "dev": true,
       "requires": {
-        "babel-core": "^6.2.1",
-        "gulp": "^3.9.0",
-        "gulp-mocha": "^2.1.3",
-        "gulp-util": "^3.0.7",
-        "istanbul": "^0.4.1",
-        "object.assign": "4.0.3",
-        "source-map": "^0.5.2"
+        "babel-core": "^6.22.1",
+        "gulp-util": "^3.0.8",
+        "istanbul-lib-coverage": "^1.0.1",
+        "istanbul-lib-report": "^1.0.0-alpha.3",
+        "istanbul-reports": "^1.0.0",
+        "object.assign": "4.0.4"
       },
       "dependencies": {
-        "abbrev": {
-          "version": "1.0.9",
-          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-          "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-          "dev": true
-        },
-        "esprima": {
-          "version": "2.7.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-          "dev": true
-        },
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-          "dev": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "istanbul": {
-          "version": "0.4.5",
-          "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
-          "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
-          "dev": true,
-          "requires": {
-            "abbrev": "1.0.x",
-            "async": "1.x",
-            "escodegen": "1.8.x",
-            "esprima": "2.7.x",
-            "glob": "^5.0.15",
-            "handlebars": "^4.0.1",
-            "js-yaml": "3.x",
-            "mkdirp": "0.5.x",
-            "nopt": "3.x",
-            "once": "1.x",
-            "resolve": "1.1.x",
-            "supports-color": "^3.1.0",
-            "which": "^1.1.1",
-            "wordwrap": "^1.0.0"
-          }
-        },
         "object.assign": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.0.3.tgz",
-          "integrity": "sha1-kaqCA7mCE18SJp2R99B1FnbyLLM=",
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz",
+          "integrity": "sha1-scnMBE7xuf5jYG/BQau7MuFHMMw=",
           "dev": true,
           "requires": {
             "define-properties": "^1.1.2",
-            "function-bind": "^1.0.2",
-            "object-keys": "^1.0.9"
+            "function-bind": "^1.1.0",
+            "object-keys": "^1.0.10"
           }
-        },
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        },
-        "wordwrap": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-          "dev": true
         }
       }
     },
@@ -8813,6 +9400,12 @@
             "arr-union": "^2.0.1",
             "extend-shallow": "^1.1.2"
           }
+        },
+        "replace-ext": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+          "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+          "dev": true
         }
       }
     },
@@ -8869,20 +9462,6 @@
         }
       }
     },
-    "gulp-mocha": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/gulp-mocha/-/gulp-mocha-2.2.0.tgz",
-      "integrity": "sha1-HOXrpLlLQMdDav7DxJgsjuqJQZI=",
-      "dev": true,
-      "requires": {
-        "gulp-util": "^3.0.0",
-        "mocha": "^2.0.1",
-        "plur": "^2.1.0",
-        "resolve-from": "^1.0.0",
-        "temp": "^0.8.3",
-        "through": "^2.3.4"
-      }
-    },
     "gulp-ng-annotate": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/gulp-ng-annotate/-/gulp-ng-annotate-2.1.0.tgz",
@@ -8958,6 +9537,14 @@
         "lodash": "^4.17.11",
         "map-stream": "*",
         "replace-ext": "^1.0.0"
+      },
+      "dependencies": {
+        "replace-ext": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+          "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+          "dev": true
+        }
       }
     },
     "gulp-notify": {
@@ -9021,12 +9608,6 @@
         "through2": "^2.0.3"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
         "arr-diff": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
@@ -9049,19 +9630,6 @@
           "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
           "dev": true
         },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
         "extend-shallow": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
@@ -9089,21 +9657,6 @@
             "arr-union": "^2.0.1",
             "extend-shallow": "^1.1.2"
           }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
         }
       }
     },
@@ -9122,6 +9675,23 @@
         "istextorbinary": "1.0.2",
         "readable-stream": "^2.0.1",
         "replacestream": "^4.0.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
       }
     },
     "gulp-replace-task": {
@@ -9136,16 +9706,13 @@
       }
     },
     "gulp-sass": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-4.1.0.tgz",
-      "integrity": "sha512-xIiwp9nkBLcJDpmYHbEHdoWZv+j+WtYaKD6Zil/67F3nrAaZtWYN5mDwerdo7EvcdBenSAj7Xb2hx2DqURLGdA==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-3.2.1.tgz",
+      "integrity": "sha512-UATbRpSDsyXCnpYSPBUEvdvtSEzksJs7/oQ0CujIpzKqKrO6vlnYwhX2UTsGrf4rNLwqlSSaM271It0uHYvJ3Q==",
       "requires": {
-        "chalk": "^2.3.0",
-        "lodash": "^4.17.11",
+        "gulp-util": "^3.0",
+        "lodash.clonedeep": "^4.3.2",
         "node-sass": "^4.8.3",
-        "plugin-error": "^1.0.1",
-        "replace-ext": "^1.0.0",
-        "strip-ansi": "^4.0.0",
         "through2": "^2.0.0",
         "vinyl-sourcemaps-apply": "^0.2.0"
       }
@@ -9175,12 +9742,6 @@
           "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
           "dev": true
         },
-        "replace-ext": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-          "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -9214,24 +9775,12 @@
         "uglify-js": "2.6.4",
         "uglify-save-license": "^0.4.1",
         "vinyl-sourcemaps-apply": "^0.2.0"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-          "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-          "dev": true,
-          "requires": {
-            "isarray": "1.0.0"
-          }
-        }
       }
     },
     "gulp-util": {
       "version": "3.0.8",
       "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
       "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
-      "dev": true,
       "requires": {
         "array-differ": "^1.0.0",
         "array-uniq": "^1.0.2",
@@ -9253,51 +9802,10 @@
         "vinyl": "^0.5.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
         "object-assign": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-          "dev": true
-        },
-        "replace-ext": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-          "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
+          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I="
         }
       }
     },
@@ -9344,11 +9852,20 @@
             "is-extglob": "^2.1.0"
           }
         },
-        "replace-ext": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-          "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-          "dev": true
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
         },
         "vinyl": {
           "version": "1.2.0",
@@ -9374,49 +9891,12 @@
         "gulp-util": "^3.0.0",
         "through2": "^2.0.1",
         "yazl": "^2.1.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
       }
     },
     "gulplog": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
       "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-      "dev": true,
       "requires": {
         "glogg": "^1.0.0"
       }
@@ -9459,9 +9939,9 @@
           "dev": true
         },
         "uglify-js": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.1.tgz",
-          "integrity": "sha512-RjxApKkrPJB6kjJxQS3iZlf///REXWYxYJxO/MpmlQzVkDWVI3PSnCBWezMecmTU/TRkNxrl8bmsfFQCp+LO+Q==",
+          "version": "3.12.4",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.4.tgz",
+          "integrity": "sha512-L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A==",
           "dev": true,
           "optional": true
         },
@@ -9558,7 +10038,6 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
       "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
-      "dev": true,
       "requires": {
         "sparkles": "^1.0.0"
       }
@@ -9582,6 +10061,14 @@
         "get-value": "^2.0.6",
         "has-values": "^1.0.0",
         "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
       }
     },
     "has-values": {
@@ -9672,8 +10159,7 @@
       "version": "2.16.3",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "hoist-non-react-statics": {
       "version": "3.3.2",
@@ -9801,33 +10287,144 @@
         }
       }
     },
-    "htmlparser2": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
-      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+    "html-webpack-plugin": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
+      "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
       "dev": true,
       "requires": {
-        "domelementtype": "^1.3.1",
-        "domhandler": "^2.3.0",
-        "domutils": "^1.5.1",
-        "entities": "^1.1.1",
-        "inherits": "^2.0.1",
-        "readable-stream": "^3.1.1"
+        "html-minifier": "^3.2.3",
+        "loader-utils": "^0.2.16",
+        "lodash": "^4.17.3",
+        "pretty-error": "^2.0.2",
+        "tapable": "^1.0.0",
+        "toposort": "^1.0.0",
+        "util.promisify": "1.0.0"
       },
       "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+        "big.js": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+          "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
+          "dev": true
+        },
+        "camel-case": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+          "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
           "dev": true,
           "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
+            "no-case": "^2.2.0",
+            "upper-case": "^1.1.1"
+          }
+        },
+        "clean-css": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
+          "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
+          "dev": true,
+          "requires": {
+            "source-map": "~0.6.0"
+          }
+        },
+        "commander": {
+          "version": "2.17.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+          "dev": true
+        },
+        "emojis-list": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+          "dev": true
+        },
+        "he": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+          "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+          "dev": true
+        },
+        "html-minifier": {
+          "version": "3.5.21",
+          "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
+          "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
+          "dev": true,
+          "requires": {
+            "camel-case": "3.0.x",
+            "clean-css": "4.2.x",
+            "commander": "2.17.x",
+            "he": "1.2.x",
+            "param-case": "2.1.x",
+            "relateurl": "0.2.x",
+            "uglify-js": "3.4.x"
+          }
+        },
+        "json5": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+          "dev": true
+        },
+        "loader-utils": {
+          "version": "0.2.17",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
+          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+          "dev": true,
+          "requires": {
+            "big.js": "^3.1.3",
+            "emojis-list": "^2.0.0",
+            "json5": "^0.5.0",
+            "object-assign": "^4.0.1"
+          }
+        },
+        "param-case": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+          "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+          "dev": true,
+          "requires": {
+            "no-case": "^2.2.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "uglify-js": {
+          "version": "3.4.10",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
+          "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
+          "dev": true,
+          "requires": {
+            "commander": "~2.19.0",
+            "source-map": "~0.6.1"
+          },
+          "dependencies": {
+            "commander": {
+              "version": "2.19.0",
+              "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+              "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
+              "dev": true
+            }
           }
         }
       }
     },
+    "htmlparser2": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.0.0.tgz",
+      "integrity": "sha512-numTQtDZMoh78zJpaNdJ9MXb2cv5G3jwUoe3dMQODubZvLoGvTE/Ofp6sHvH8OGKcN/8A47pGLi/k58xHP/Tfw==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.0.0",
+        "domutils": "^2.4.4",
+        "entities": "^2.0.0"
+      }
+    },
     "http-errors": {
       "version": "1.7.2",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
@@ -9856,9 +10453,9 @@
       }
     },
     "http-parser-js": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz",
-      "integrity": "sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",
+      "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==",
       "dev": true
     },
     "http-proxy": {
@@ -9929,10 +10526,9 @@
       "dev": true
     },
     "ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
-      "dev": true
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
     },
     "iferr": {
       "version": "0.1.5",
@@ -9953,12 +10549,26 @@
       "dev": true,
       "optional": true
     },
+    "immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
+    },
     "immutable": {
       "version": "3.8.2",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz",
       "integrity": "sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=",
       "dev": true
     },
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
     "import-local": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz",
@@ -10081,9 +10691,9 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
       "dev": true
     },
     "inquirer": {
@@ -10105,42 +10715,6 @@
         "string-width": "^1.0.1",
         "strip-ansi": "^3.0.0",
         "through": "^2.3.6"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
       }
     },
     "interpret": {
@@ -10207,9 +10781,12 @@
       }
     },
     "is-arguments": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
-      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
+      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
+      "requires": {
+        "call-bind": "^1.0.0"
+      }
     },
     "is-arrayish": {
       "version": "0.2.1",
@@ -10226,9 +10803,9 @@
       }
     },
     "is-bigint": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.0.tgz",
-      "integrity": "sha512-t5mGUXC/xRheCK431ylNiSkGGpBp8bHENBcENTkDT6ppwPzEVxNGZRvgvmOEfbWkFhA7D2GEuE2mmQTr78sl2g==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz",
+      "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==",
       "dev": true
     },
     "is-binary-path": {
@@ -10241,20 +10818,23 @@
       }
     },
     "is-boolean-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.0.1.tgz",
-      "integrity": "sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ==",
-      "dev": true
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
+      "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0"
+      }
     },
     "is-buffer": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
-      "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="
     },
     "is-callable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
+      "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="
     },
     "is-ci": {
       "version": "1.2.1",
@@ -10265,6 +10845,14 @@
         "ci-info": "^1.5.0"
       }
     },
+    "is-core-module": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
+      "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
     "is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -10353,11 +10941,17 @@
       }
     },
     "is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extended": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/is-extended/-/is-extended-0.0.10.tgz",
+      "integrity": "sha1-JE4UDfdbscmjEG9BL/GC+1NKbWI=",
       "requires": {
-        "is-plain-object": "^2.0.4"
+        "extended": "~0.0.3"
       }
     },
     "is-extglob": {
@@ -10386,9 +10980,9 @@
       "dev": true
     },
     "is-generator-function": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.7.tgz",
-      "integrity": "sha512-YZc5EwyO4f2kWCax7oegfuSr9mFz1ZvieNYBEjmukLxgXfBUbxAWGVF7GZf0zidYtoBl3WvC07YK0wT76a+Rtw==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.8.tgz",
+      "integrity": "sha512-2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ==",
       "dev": true
     },
     "is-glob": {
@@ -10419,9 +11013,9 @@
       }
     },
     "is-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz",
-      "integrity": "sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
+      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
       "dev": true
     },
     "is-my-ip-valid": {
@@ -10443,6 +11037,11 @@
         "xtend": "^4.0.0"
       }
     },
+    "is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="
+    },
     "is-number": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
@@ -10507,8 +11106,17 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
       "requires": {
         "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
       }
     },
     "is-posix-bracket": {
@@ -10558,9 +11166,9 @@
       "dev": true
     },
     "is-set": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz",
-      "integrity": "sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
+      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
       "dev": true
     },
     "is-stream": {
@@ -10669,9 +11277,13 @@
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+      "dev": true,
+      "requires": {
+        "isarray": "1.0.0"
+      }
     },
     "isomorphic-fetch": {
       "version": "2.2.1",
@@ -10705,6 +11317,12 @@
           "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
           "dev": true
         },
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        },
         "glob": {
           "version": "5.0.15",
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
@@ -10819,6 +11437,12 @@
           "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
           "dev": true
         },
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        },
         "wordwrap": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
@@ -10844,17 +11468,6 @@
         "js-yaml": "^3.7.0",
         "mkdirp": "^0.5.1",
         "once": "^1.4.0"
-      },
-      "dependencies": {
-        "async": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-          "dev": true,
-          "requires": {
-            "lodash": "^4.17.14"
-          }
-        }
       }
     },
     "istanbul-instrumenter-loader": {
@@ -10874,6 +11487,12 @@
           "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
           "dev": true
         },
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        },
         "big.js": {
           "version": "3.2.0",
           "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
@@ -11073,30 +11692,6 @@
         "textextensions": "~1.0.0"
       }
     },
-    "jade": {
-      "version": "0.26.3",
-      "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
-      "integrity": "sha1-jxDXl32NefL2/4YqgbBRPMslaGw=",
-      "dev": true,
-      "requires": {
-        "commander": "0.6.1",
-        "mkdirp": "0.3.0"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz",
-          "integrity": "sha1-+mihT2qUXVTbvlDYzbMyDp47GgY=",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
-          "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=",
-          "dev": true
-        }
-      }
-    },
     "jest": {
       "version": "23.6.0",
       "resolved": "https://registry.npmjs.org/jest/-/jest-23.6.0.tgz",
@@ -11113,12 +11708,38 @@
           "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
           "dev": true
         },
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
         "camelcase": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
           "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
           "dev": true
         },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
         "cliui": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
@@ -11300,6 +11921,24 @@
             "strip-ansi": "^4.0.0"
           }
         },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
         "wrap-ansi": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
@@ -11310,6 +11949,12 @@
             "strip-ansi": "^3.0.1"
           },
           "dependencies": {
+            "ansi-regex": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+              "dev": true
+            },
             "is-fullwidth-code-point": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
@@ -11342,9 +11987,9 @@
           }
         },
         "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+          "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
           "dev": true
         },
         "yargs": {
@@ -11409,30 +12054,33 @@
         "pretty-format": "^23.6.0"
       },
       "dependencies": {
-        "babel-jest": {
-          "version": "23.6.0",
-          "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-23.6.0.tgz",
-          "integrity": "sha512-lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "babel-plugin-istanbul": "^4.1.6",
-            "babel-preset-jest": "^23.2.0"
+            "color-convert": "^1.9.0"
           }
         },
-        "babel-plugin-jest-hoist": {
-          "version": "23.2.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz",
-          "integrity": "sha1-5h+uBaHKiAGq3uV6bWa4zvr0QWc=",
-          "dev": true
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
         },
-        "babel-preset-jest": {
-          "version": "23.2.0",
-          "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz",
-          "integrity": "sha1-jsegOhOPABoaj7HoETZSvxpV2kY=",
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
           "dev": true,
           "requires": {
-            "babel-plugin-jest-hoist": "^23.2.0",
-            "babel-plugin-syntax-object-rest-spread": "^6.13.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -11447,6 +12095,37 @@
         "diff": "^3.2.0",
         "jest-get-type": "^22.1.0",
         "pretty-format": "^23.6.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "jest-docblock": {
@@ -11466,6 +12145,37 @@
       "requires": {
         "chalk": "^2.0.1",
         "pretty-format": "^23.6.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "jest-environment-enzyme": {
@@ -11477,12 +12187,32 @@
         "jest-environment-jsdom": "^22.4.1"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
         "callsites": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
           "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
           "dev": true
         },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
         "jest-environment-jsdom": {
           "version": "22.4.3",
           "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-22.4.3.tgz",
@@ -11533,6 +12263,15 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
@@ -11620,6 +12359,26 @@
         "pretty-format": "^23.6.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
         "expect": {
           "version": "23.6.0",
           "resolved": "https://registry.npmjs.org/expect/-/expect-23.6.0.tgz",
@@ -11633,6 +12392,15 @@
             "jest-message-util": "^23.4.0",
             "jest-regex-util": "^23.3.0"
           }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
@@ -11654,6 +12422,37 @@
         "chalk": "^2.0.1",
         "jest-get-type": "^22.1.0",
         "pretty-format": "^23.6.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "jest-message-util": {
@@ -11667,6 +12466,37 @@
         "micromatch": "^2.3.11",
         "slash": "^1.0.0",
         "stack-utils": "^1.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "jest-mock": {
@@ -11690,6 +12520,37 @@
         "browser-resolve": "^1.11.3",
         "chalk": "^2.0.1",
         "realpath-native": "^1.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "jest-resolve-dependencies": {
@@ -11770,12 +12631,38 @@
         "yargs": "^11.0.0"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
         "camelcase": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
           "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
           "dev": true
         },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
         "cliui": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
@@ -11890,12 +12777,30 @@
             "strip-ansi": "^4.0.0"
           }
         },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        },
         "strip-bom": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
           "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
           "dev": true
         },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
         "wrap-ansi": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
@@ -11906,6 +12811,12 @@
             "strip-ansi": "^3.0.1"
           },
           "dependencies": {
+            "ansi-regex": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+              "dev": true
+            },
             "is-fullwidth-code-point": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
@@ -11938,9 +12849,9 @@
           }
         },
         "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+          "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
           "dev": true
         },
         "yargs": {
@@ -11996,6 +12907,37 @@
         "natural-compare": "^1.4.0",
         "pretty-format": "^23.6.0",
         "semver": "^5.5.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "jest-util": {
@@ -12014,17 +12956,46 @@
         "source-map": "^0.6.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
         "callsites": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
           "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
           "dev": true
         },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
@@ -12040,11 +13011,40 @@
         "pretty-format": "^23.6.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
         "leven": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
           "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=",
           "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
@@ -12065,6 +13065,32 @@
           "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
           "dev": true
         },
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
         "string-length": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz",
@@ -12074,6 +13100,24 @@
             "astral-regex": "^1.0.0",
             "strip-ansi": "^4.0.0"
           }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
@@ -12102,9 +13146,9 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "js-yaml": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
-      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -12204,42 +13248,6 @@
         "plur": "^2.1.0",
         "string-length": "^1.0.0",
         "text-table": "^0.2.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
       }
     },
     "json-loader": {
@@ -12248,6 +13256,11 @@
       "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
       "dev": true
     },
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+    },
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -12345,6 +13358,12 @@
         }
       }
     },
+    "jsx-ast-utils": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz",
+      "integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=",
+      "dev": true
+    },
     "jsx-loader": {
       "version": "0.13.2",
       "resolved": "https://registry.npmjs.org/jsx-loader/-/jsx-loader-0.13.2.tgz",
@@ -12387,10 +13406,37 @@
         }
       }
     },
+    "jszip": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz",
+      "integrity": "sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==",
+      "requires": {
+        "lie": "~3.3.0",
+        "pako": "~1.0.2",
+        "readable-stream": "~2.3.6",
+        "set-immediate-shim": "~1.0.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
+      }
+    },
     "just-extend": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.0.tgz",
-      "integrity": "sha512-ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA=="
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz",
+      "integrity": "sha512-aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA=="
     },
     "karma": {
       "version": "0.13.22",
@@ -12439,6 +13485,12 @@
           "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=",
           "dev": true
         },
+        "base64-arraybuffer": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+          "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
+          "dev": true
+        },
         "batch": {
           "version": "0.5.3",
           "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz",
@@ -12564,6 +13616,24 @@
           "integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=",
           "dev": true
         },
+        "parseqs": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
+          "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
+          "dev": true,
+          "requires": {
+            "better-assert": "~1.0.0"
+          }
+        },
+        "parseuri": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
+          "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
+          "dev": true,
+          "requires": {
+            "better-assert": "~1.0.0"
+          }
+        },
         "socket.io": {
           "version": "1.7.4",
           "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.7.4.tgz",
@@ -12684,12 +13754,6 @@
         "babel-core": "^5.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
         "babel-core": {
           "version": "5.8.38",
           "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.38.tgz",
@@ -12756,19 +13820,6 @@
           "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=",
           "dev": true
         },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
         "core-js": {
           "version": "1.2.7",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
@@ -12879,21 +13930,6 @@
             }
           }
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        },
         "to-fast-properties": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
@@ -12936,6 +13972,12 @@
           "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
           "dev": true
         },
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        },
         "dateformat": {
           "version": "1.0.12",
           "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
@@ -13094,6 +14136,30 @@
       "integrity": "sha1-U3cWwHduTPeePtG2IfdljCkRsbE=",
       "dev": true
     },
+    "lazystream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
+      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
+      "requires": {
+        "readable-stream": "^2.0.5"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
+      }
+    },
     "lcid": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
@@ -13295,6 +14361,14 @@
         "type-check": "~0.3.2"
       }
     },
+    "lie": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+      "requires": {
+        "immediate": "~3.0.5"
+      }
+    },
     "liftoff": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz",
@@ -13317,6 +14391,16 @@
       "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==",
       "dev": true
     },
+    "lines-and-columns": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
+      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
+    },
+    "listenercount": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
+      "integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc="
+    },
     "load-json-file": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -13359,55 +14443,92 @@
       }
     },
     "localtunnel": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.0.tgz",
-      "integrity": "sha512-g6E0aLgYYDvQDxIjIXkgJo2+pHj3sGg4Wz/XP3h2KtZnRsWPbOQY+hw1H8Z91jep998fkcVE9l+kghO+97vllg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.1.tgz",
+      "integrity": "sha512-LiaI5wZdz0xFkIQpXbNI62ZnNn8IMsVhwxHmhA+h4vj8R9JG/07bQHWwQlyy7b95/5fVOCHJfIHv+a5XnkvaJA==",
       "dev": true,
       "requires": {
-        "axios": "0.19.0",
-        "debug": "4.1.1",
+        "axios": "0.21.1",
+        "debug": "4.3.1",
         "openurl": "1.1.1",
-        "yargs": "13.3.0"
+        "yargs": "16.2.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "axios": {
-          "version": "0.19.0",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
-          "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
+          "version": "0.21.1",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+          "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
           "dev": true,
           "requires": {
-            "follow-redirects": "1.5.10",
-            "is-buffer": "^2.0.2"
+            "follow-redirects": "^1.10.0"
           }
         },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+        "cliui": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^7.0.0"
           }
         },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
           }
         },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
+        "follow-redirects": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz",
+          "integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==",
+          "dev": true
+        },
         "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
           "dev": true
         },
         "ms": {
@@ -13417,42 +14538,62 @@
           "dev": true
         },
         "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
           "dev": true,
           "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
           }
         },
         "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^4.1.0"
+            "ansi-regex": "^5.0.0"
           }
         },
+        "wrap-ansi": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "y18n": {
+          "version": "5.0.5",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz",
+          "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==",
+          "dev": true
+        },
         "yargs": {
-          "version": "13.3.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
-          "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
+          "version": "16.2.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
           "dev": true,
           "requires": {
-            "cliui": "^5.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^2.0.1",
+            "cliui": "^7.0.2",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
             "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.1"
+            "string-width": "^4.2.0",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^20.2.2"
           }
+        },
+        "yargs-parser": {
+          "version": "20.2.4",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+          "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+          "dev": true
         }
       }
     },
@@ -13478,9 +14619,9 @@
       "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
     },
     "lodash-es": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz",
-      "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ=="
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.20.tgz",
+      "integrity": "sha512-JD1COMZsq8maT6mnuz1UMV0jvYD0E0aUsSOdrr1/nAG3dhqQXwRRgeW0cSqH1U43INKcqxaiVIQNOUDld7gRDA=="
     },
     "lodash._arraycopy": {
       "version": "3.0.0",
@@ -13521,7 +14662,12 @@
     "lodash._basecopy": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY="
+    },
+    "lodash._basecreate": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
+      "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=",
       "dev": true
     },
     "lodash._basefor": {
@@ -13544,14 +14690,12 @@
     "lodash._basetostring": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
-      "dev": true
+      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U="
     },
     "lodash._basevalues": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
-      "dev": true
+      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc="
     },
     "lodash._bindcallback": {
       "version": "3.0.1",
@@ -13587,8 +14731,7 @@
     "lodash._getnative": {
       "version": "3.9.1",
       "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-      "dev": true
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
     },
     "lodash._htmlescapes": {
       "version": "2.4.1",
@@ -13599,8 +14742,7 @@
     "lodash._isiterateecall": {
       "version": "3.0.9",
       "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-      "dev": true
+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
     },
     "lodash._isnative": {
       "version": "2.4.1",
@@ -13617,20 +14759,17 @@
     "lodash._reescape": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
-      "dev": true
+      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo="
     },
     "lodash._reevaluate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
-      "dev": true
+      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0="
     },
     "lodash._reinterpolate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-      "dev": true
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
     },
     "lodash._reunescapedhtml": {
       "version": "2.4.1",
@@ -13658,8 +14797,7 @@
     "lodash._root": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
-      "dev": true
+      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI="
     },
     "lodash._shimkeys": {
       "version": "2.4.1",
@@ -13694,9 +14832,25 @@
     "lodash.clonedeep": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
+    },
+    "lodash.cond": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz",
+      "integrity": "sha1-9HGh2khr5g9quVXRcRVSPdHSVdU=",
       "dev": true
     },
+    "lodash.create": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
+      "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=",
+      "dev": true,
+      "requires": {
+        "lodash._baseassign": "^3.0.0",
+        "lodash._basecreate": "^3.0.0",
+        "lodash._isiterateecall": "^3.0.0"
+      }
+    },
     "lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
@@ -13712,39 +14866,45 @@
       }
     },
     "lodash.defaults": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
-      "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=",
-      "dev": true,
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
+      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw="
+    },
+    "lodash.difference": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
+      "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw="
+    },
+    "lodash.endswith": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/lodash.endswith/-/lodash.endswith-4.2.1.tgz",
+      "integrity": "sha1-/tWawXOO0+I27dcGTsRWRIs3vAk=",
+      "dev": true
+    },
+    "lodash.escape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
+      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
       "requires": {
-        "lodash._objecttypes": "~2.4.1",
-        "lodash.keys": "~2.4.1"
-      },
-      "dependencies": {
-        "lodash.keys": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-          "dev": true,
-          "requires": {
-            "lodash._isnative": "~2.4.1",
-            "lodash._shimkeys": "~2.4.1",
-            "lodash.isobject": "~2.4.1"
-          }
-        }
+        "lodash._root": "^3.0.0"
       }
     },
-    "lodash.escape": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz",
-      "integrity": "sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=",
+    "lodash.find": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.find/-/lodash.find-4.6.0.tgz",
+      "integrity": "sha1-ywcE1Hq3F4n/oN6Ll92Sb7iLE7E=",
+      "dev": true
+    },
+    "lodash.findindex": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.findindex/-/lodash.findindex-4.6.0.tgz",
+      "integrity": "sha1-oyRd7mH7m24GJLU1ElYku2nBEQY=",
       "dev": true
     },
     "lodash.flatten": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
-      "dev": true
+      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8="
     },
     "lodash.flattendeep": {
       "version": "4.4.0",
@@ -13755,14 +14915,12 @@
     "lodash.isarguments": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-      "dev": true
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
     },
     "lodash.isarray": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-      "dev": true
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
     },
     "lodash.isequal": {
       "version": "4.5.0",
@@ -13787,8 +14945,7 @@
     "lodash.isplainobject": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
-      "dev": true
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
     },
     "lodash.istypedarray": {
       "version": "3.0.6",
@@ -13800,7 +14957,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
       "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-      "dev": true,
       "requires": {
         "lodash._getnative": "^3.0.0",
         "lodash.isarguments": "^3.0.0",
@@ -13840,8 +14996,7 @@
     "lodash.restparam": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-      "dev": true
+      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
     },
     "lodash.sortby": {
       "version": "4.7.0",
@@ -13853,7 +15008,6 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
       "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
-      "dev": true,
       "requires": {
         "lodash._basecopy": "^3.0.0",
         "lodash._basetostring": "^3.0.0",
@@ -13864,38 +15018,15 @@
         "lodash.keys": "^3.0.0",
         "lodash.restparam": "^3.0.0",
         "lodash.templatesettings": "^3.0.0"
-      },
-      "dependencies": {
-        "lodash.escape": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-          "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-          "dev": true,
-          "requires": {
-            "lodash._root": "^3.0.0"
-          }
-        }
       }
     },
     "lodash.templatesettings": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
       "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
-      "dev": true,
       "requires": {
         "lodash._reinterpolate": "^3.0.0",
         "lodash.escape": "^3.0.0"
-      },
-      "dependencies": {
-        "lodash.escape": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-          "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-          "dev": true,
-          "requires": {
-            "lodash._root": "^3.0.0"
-          }
-        }
       }
     },
     "lodash.throttle": {
@@ -13909,6 +15040,11 @@
       "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE=",
       "dev": true
     },
+    "lodash.union": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
+      "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg="
+    },
     "lodash.uniq": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
@@ -13953,42 +15089,6 @@
       "dev": true,
       "requires": {
         "chalk": "^1.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
       }
     },
     "log4js": {
@@ -14188,13 +15288,42 @@
           "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
           "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
           "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
     "math-expression-evaluator": {
-      "version": "1.2.22",
-      "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.22.tgz",
-      "integrity": "sha512-L0j0tFVZBQQLeEjmWOvDLoRciIY8gQGWahvkztXUal8jH8R5Rlqo9GCvgqvXcy9LQhEWdQCVvzqAbxgYNt4blQ=="
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.3.7.tgz",
+      "integrity": "sha512-nrbaifCl42w37hYd6oRLvoymFK42tWB+WQTMFtksDGQMi5GvlJwnz/CsS30FFAISFLtX+A0csJ0xLiuuyyec7w=="
     },
     "math-random": {
       "version": "1.0.4",
@@ -14236,6 +15365,11 @@
         "p-is-promise": "^2.0.0"
       }
     },
+    "memoize-one": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.1.1.tgz",
+      "integrity": "sha512-HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA=="
+    },
     "memory-fs": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz",
@@ -14244,6 +15378,23 @@
       "requires": {
         "errno": "^0.1.3",
         "readable-stream": "^2.0.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
       }
     },
     "meow": {
@@ -14282,6 +15433,23 @@
       "dev": true,
       "requires": {
         "readable-stream": "^2.0.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
       }
     },
     "methods": {
@@ -14311,13 +15479,13 @@
         "regex-cache": "^0.4.2"
       },
       "dependencies": {
-        "arr-diff": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
           "dev": true,
           "requires": {
-            "arr-flatten": "^1.0.1"
+            "remove-trailing-separator": "^1.0.1"
           }
         }
       }
@@ -14328,16 +15496,16 @@
       "integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA="
     },
     "mime-db": {
-      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
-      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
+      "version": "1.45.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz",
+      "integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="
     },
     "mime-types": {
-      "version": "2.1.27",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
-      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "version": "2.1.28",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz",
+      "integrity": "sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==",
       "requires": {
-        "mime-db": "1.44.0"
+        "mime-db": "1.45.0"
       }
     },
     "mimic-fn": {
@@ -14350,7 +15518,6 @@
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
       "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
-      "dev": true,
       "requires": {
         "dom-walk": "^0.1.0"
       }
@@ -14400,6 +15567,17 @@
       "requires": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
       }
     },
     "mkdirp": {
@@ -14411,75 +15589,74 @@
       }
     },
     "mocha": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
-      "integrity": "sha1-FhvlvetJZ3HrmzV0UFC2IrWu/Fg=",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz",
+      "integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==",
       "dev": true,
       "requires": {
-        "commander": "2.3.0",
-        "debug": "2.2.0",
-        "diff": "1.4.0",
-        "escape-string-regexp": "1.0.2",
-        "glob": "3.2.11",
+        "browser-stdout": "1.3.0",
+        "commander": "2.9.0",
+        "debug": "2.6.8",
+        "diff": "3.2.0",
+        "escape-string-regexp": "1.0.5",
+        "glob": "7.1.1",
         "growl": "1.9.2",
-        "jade": "0.26.3",
+        "he": "1.1.1",
+        "json3": "3.3.2",
+        "lodash.create": "3.1.1",
         "mkdirp": "0.5.1",
-        "supports-color": "1.2.0",
-        "to-iso-string": "0.0.2"
+        "supports-color": "3.1.2"
       },
       "dependencies": {
         "commander": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz",
-          "integrity": "sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=",
-          "dev": true
+          "version": "2.9.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+          "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
+          "dev": true,
+          "requires": {
+            "graceful-readlink": ">= 1.0.0"
+          }
         },
         "debug": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "version": "2.6.8",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
           "dev": true,
           "requires": {
-            "ms": "0.7.1"
+            "ms": "2.0.0"
           }
         },
         "diff": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
-          "integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=",
-          "dev": true
-        },
-        "escape-string-regexp": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
-          "integrity": "sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE=",
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
+          "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=",
           "dev": true
         },
         "glob": {
-          "version": "3.2.11",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-          "integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=",
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
+          "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
           "dev": true,
           "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
             "inherits": "2",
-            "minimatch": "0.3"
+            "minimatch": "^3.0.2",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
-        "lru-cache": {
-          "version": "2.7.3",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
-          "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
           "dev": true
         },
-        "minimatch": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-          "integrity": "sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=",
-          "dev": true,
-          "requires": {
-            "lru-cache": "2",
-            "sigmund": "~1.0.0"
-          }
+        "he": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+          "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+          "dev": true
         },
         "minimist": {
           "version": "0.0.8",
@@ -14496,29 +15673,26 @@
             "minimist": "0.0.8"
           }
         },
-        "ms": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
-          "dev": true
-        },
         "supports-color": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz",
-          "integrity": "sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4=",
-          "dev": true
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
+          "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=",
+          "dev": true,
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
         }
       }
     },
     "moment": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
-      "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
     },
     "moment-timezone": {
-      "version": "0.5.31",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.31.tgz",
-      "integrity": "sha512-+GgHNg8xRhMXfEbv81iDtrVeTcWt0kWmTEY1XQK14dICTXnWJnT0dxdlPspwqF3keKMVPXwayEsk1DI0AA/jdA==",
+      "version": "0.5.32",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.32.tgz",
+      "integrity": "sha512-Z8QNyuQHQAmWucp8Knmgei8YNo28aLjJq6Ma+jy1ZSpSk5nyfRT8xgUbSQvD2+2UajISfenndwvFuH3NGS+nvA==",
       "requires": {
         "moment": ">= 2.9.0"
       }
@@ -14564,9 +15738,39 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
       "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
-      "dev": true,
       "requires": {
         "duplexer2": "0.0.2"
+      },
+      "dependencies": {
+        "duplexer2": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+          "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
+          "requires": {
+            "readable-stream": "~1.1.9"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+        }
       }
     },
     "mute-stream": {
@@ -14576,9 +15780,9 @@
       "dev": true
     },
     "nan": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
-      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
+      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -14599,6 +15803,12 @@
         "to-regex": "^3.0.1"
       },
       "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -14641,16 +15851,15 @@
       "dev": true
     },
     "nearley": {
-      "version": "2.19.5",
-      "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.19.5.tgz",
-      "integrity": "sha512-qoh1ZXXl0Kpn40tFhmgvffUAlbpRMcjLUagNVnT1JmliUIsB4tFabmCNhD97+tkf9FZ/SLhhYzNow0V3GitzDg==",
+      "version": "2.20.1",
+      "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz",
+      "integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==",
       "dev": true,
       "requires": {
         "commander": "^2.19.0",
         "moo": "^0.5.0",
         "railroad-diagrams": "^1.0.0",
-        "randexp": "0.4.6",
-        "semver": "^5.4.1"
+        "randexp": "0.4.6"
       }
     },
     "negotiator": {
@@ -14739,6 +15948,15 @@
         }
       }
     },
+    "no-case": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "dev": true,
+      "requires": {
+        "lower-case": "^1.1.1"
+      }
+    },
     "nock": {
       "version": "8.2.2",
       "resolved": "https://registry.npmjs.org/nock/-/nock-8.2.2.tgz",
@@ -14853,12 +16071,49 @@
         "vm-browserify": "0.0.4"
       },
       "dependencies": {
+        "buffer": {
+          "version": "4.9.2",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+          "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+          "dev": true,
+          "requires": {
+            "base64-js": "^1.0.2",
+            "ieee754": "^1.1.4",
+            "isarray": "^1.0.0"
+          }
+        },
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
           "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
           "dev": true
         },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          },
+          "dependencies": {
+            "string_decoder": {
+              "version": "1.1.1",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+              "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+              "dev": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
         "string_decoder": {
           "version": "0.10.31",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
@@ -14916,38 +16171,6 @@
         "sass-graph": "2.2.5",
         "stdout-stream": "^1.4.0",
         "true-case-path": "^1.0.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-        }
       }
     },
     "node-watch": {
@@ -14998,6 +16221,12 @@
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
           "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=",
           "dev": true
+        },
+        "underscore": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+          "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
+          "dev": true
         }
       }
     },
@@ -15021,13 +16250,9 @@
       }
     },
     "normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "requires": {
-        "remove-trailing-separator": "^1.0.1"
-      }
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
     },
     "normalize-range": {
       "version": "0.1.2",
@@ -15047,6 +16272,3100 @@
         "sort-keys": "^1.0.0"
       }
     },
+    "npm": {
+      "version": "6.14.11",
+      "resolved": "https://registry.npmjs.org/npm/-/npm-6.14.11.tgz",
+      "integrity": "sha512-1Zh7LjuIoEhIyjkBflSSGzfjuPQwDlghNloppjruOH5bmj9midT9qcNT0tRUZRR04shU9ekrxNy9+UTBrqeBpQ==",
+      "requires": {
+        "JSONStream": "^1.3.5",
+        "abbrev": "~1.1.1",
+        "ansicolors": "~0.3.2",
+        "ansistyles": "~0.1.3",
+        "aproba": "^2.0.0",
+        "archy": "~1.0.0",
+        "bin-links": "^1.1.8",
+        "bluebird": "^3.5.5",
+        "byte-size": "^5.0.1",
+        "cacache": "^12.0.3",
+        "call-limit": "^1.1.1",
+        "chownr": "^1.1.4",
+        "ci-info": "^2.0.0",
+        "cli-columns": "^3.1.2",
+        "cli-table3": "^0.5.1",
+        "cmd-shim": "^3.0.3",
+        "columnify": "~1.5.4",
+        "config-chain": "^1.1.12",
+        "debuglog": "*",
+        "detect-indent": "~5.0.0",
+        "detect-newline": "^2.1.0",
+        "dezalgo": "~1.0.3",
+        "editor": "~1.0.0",
+        "figgy-pudding": "^3.5.1",
+        "find-npm-prefix": "^1.0.2",
+        "fs-vacuum": "~1.2.10",
+        "fs-write-stream-atomic": "~1.0.10",
+        "gentle-fs": "^2.3.1",
+        "glob": "^7.1.6",
+        "graceful-fs": "^4.2.4",
+        "has-unicode": "~2.0.1",
+        "hosted-git-info": "^2.8.8",
+        "iferr": "^1.0.2",
+        "imurmurhash": "*",
+        "infer-owner": "^1.0.4",
+        "inflight": "~1.0.6",
+        "inherits": "^2.0.4",
+        "ini": "^1.3.8",
+        "init-package-json": "^1.10.3",
+        "is-cidr": "^3.0.0",
+        "json-parse-better-errors": "^1.0.2",
+        "lazy-property": "~1.0.0",
+        "libcipm": "^4.0.8",
+        "libnpm": "^3.0.1",
+        "libnpmaccess": "^3.0.2",
+        "libnpmhook": "^5.0.3",
+        "libnpmorg": "^1.0.1",
+        "libnpmsearch": "^2.0.2",
+        "libnpmteam": "^1.0.2",
+        "libnpx": "^10.2.4",
+        "lock-verify": "^2.1.0",
+        "lockfile": "^1.0.4",
+        "lodash._baseindexof": "*",
+        "lodash._baseuniq": "~4.6.0",
+        "lodash._bindcallback": "*",
+        "lodash._cacheindexof": "*",
+        "lodash._createcache": "*",
+        "lodash._getnative": "*",
+        "lodash.clonedeep": "~4.5.0",
+        "lodash.restparam": "*",
+        "lodash.union": "~4.6.0",
+        "lodash.uniq": "~4.5.0",
+        "lodash.without": "~4.4.0",
+        "lru-cache": "^5.1.1",
+        "meant": "^1.0.2",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.5",
+        "move-concurrently": "^1.0.1",
+        "node-gyp": "^5.1.0",
+        "nopt": "^4.0.3",
+        "normalize-package-data": "^2.5.0",
+        "npm-audit-report": "^1.3.3",
+        "npm-cache-filename": "~1.0.2",
+        "npm-install-checks": "^3.0.2",
+        "npm-lifecycle": "^3.1.5",
+        "npm-package-arg": "^6.1.1",
+        "npm-packlist": "^1.4.8",
+        "npm-pick-manifest": "^3.0.2",
+        "npm-profile": "^4.0.4",
+        "npm-registry-fetch": "^4.0.7",
+        "npm-user-validate": "^1.0.1",
+        "npmlog": "~4.1.2",
+        "once": "~1.4.0",
+        "opener": "^1.5.2",
+        "osenv": "^0.1.5",
+        "pacote": "^9.5.12",
+        "path-is-inside": "~1.0.2",
+        "promise-inflight": "~1.0.1",
+        "qrcode-terminal": "^0.12.0",
+        "query-string": "^6.8.2",
+        "qw": "~1.0.1",
+        "read": "~1.0.7",
+        "read-cmd-shim": "^1.0.5",
+        "read-installed": "~4.0.3",
+        "read-package-json": "^2.1.1",
+        "read-package-tree": "^5.3.1",
+        "readable-stream": "^3.6.0",
+        "readdir-scoped-modules": "^1.1.0",
+        "request": "^2.88.0",
+        "retry": "^0.12.0",
+        "rimraf": "^2.7.1",
+        "safe-buffer": "^5.1.2",
+        "semver": "^5.7.1",
+        "sha": "^3.0.0",
+        "slide": "~1.1.6",
+        "sorted-object": "~2.0.1",
+        "sorted-union-stream": "~2.1.3",
+        "ssri": "^6.0.1",
+        "stringify-package": "^1.0.1",
+        "tar": "^4.4.13",
+        "text-table": "~0.2.0",
+        "tiny-relative-date": "^1.3.0",
+        "uid-number": "0.0.6",
+        "umask": "~1.1.0",
+        "unique-filename": "^1.1.1",
+        "unpipe": "~1.0.0",
+        "update-notifier": "^2.5.0",
+        "uuid": "^3.3.3",
+        "validate-npm-package-license": "^3.0.4",
+        "validate-npm-package-name": "~3.0.0",
+        "which": "^1.3.1",
+        "worker-farm": "^1.7.0",
+        "write-file-atomic": "^2.4.3"
+      },
+      "dependencies": {
+        "JSONStream": {
+          "version": "1.3.5",
+          "bundled": true,
+          "requires": {
+            "jsonparse": "^1.2.0",
+            "through": ">=2.2.7 <3"
+          }
+        },
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true
+        },
+        "agent-base": {
+          "version": "4.3.0",
+          "bundled": true,
+          "requires": {
+            "es6-promisify": "^5.0.0"
+          }
+        },
+        "agentkeepalive": {
+          "version": "3.5.2",
+          "bundled": true,
+          "requires": {
+            "humanize-ms": "^1.2.1"
+          }
+        },
+        "ansi-align": {
+          "version": "2.0.0",
+          "bundled": true,
+          "requires": {
+            "string-width": "^2.0.0"
+          }
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "bundled": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "ansicolors": {
+          "version": "0.3.2",
+          "bundled": true
+        },
+        "ansistyles": {
+          "version": "0.1.3",
+          "bundled": true
+        },
+        "aproba": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "archy": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "asap": {
+          "version": "2.0.6",
+          "bundled": true
+        },
+        "asn1": {
+          "version": "0.2.4",
+          "bundled": true,
+          "requires": {
+            "safer-buffer": "~2.1.0"
+          }
+        },
+        "assert-plus": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true
+        },
+        "aws-sign2": {
+          "version": "0.7.0",
+          "bundled": true
+        },
+        "aws4": {
+          "version": "1.8.0",
+          "bundled": true
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "tweetnacl": "^0.14.3"
+          }
+        },
+        "bin-links": {
+          "version": "1.1.8",
+          "bundled": true,
+          "requires": {
+            "bluebird": "^3.5.3",
+            "cmd-shim": "^3.0.0",
+            "gentle-fs": "^2.3.0",
+            "graceful-fs": "^4.1.15",
+            "npm-normalize-package-bin": "^1.0.0",
+            "write-file-atomic": "^2.3.0"
+          }
+        },
+        "bluebird": {
+          "version": "3.5.5",
+          "bundled": true
+        },
+        "boxen": {
+          "version": "1.3.0",
+          "bundled": true,
+          "requires": {
+            "ansi-align": "^2.0.0",
+            "camelcase": "^4.0.0",
+            "chalk": "^2.0.1",
+            "cli-boxes": "^1.0.0",
+            "string-width": "^2.0.0",
+            "term-size": "^1.2.0",
+            "widest-line": "^2.0.0"
+          }
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "buffer-from": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "builtins": {
+          "version": "1.0.3",
+          "bundled": true
+        },
+        "byline": {
+          "version": "5.0.0",
+          "bundled": true
+        },
+        "byte-size": {
+          "version": "5.0.1",
+          "bundled": true
+        },
+        "cacache": {
+          "version": "12.0.3",
+          "bundled": true,
+          "requires": {
+            "bluebird": "^3.5.5",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.1.15",
+            "infer-owner": "^1.0.3",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.6.3",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
+          }
+        },
+        "call-limit": {
+          "version": "1.1.1",
+          "bundled": true
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "bundled": true
+        },
+        "capture-stack-trace": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "bundled": true
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "bundled": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "chownr": {
+          "version": "1.1.4",
+          "bundled": true
+        },
+        "ci-info": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "cidr-regex": {
+          "version": "2.0.10",
+          "bundled": true,
+          "requires": {
+            "ip-regex": "^2.1.0"
+          }
+        },
+        "cli-boxes": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "cli-columns": {
+          "version": "3.1.2",
+          "bundled": true,
+          "requires": {
+            "string-width": "^2.0.0",
+            "strip-ansi": "^3.0.1"
+          }
+        },
+        "cli-table3": {
+          "version": "0.5.1",
+          "bundled": true,
+          "requires": {
+            "colors": "^1.1.2",
+            "object-assign": "^4.1.0",
+            "string-width": "^2.1.1"
+          }
+        },
+        "cliui": {
+          "version": "5.0.0",
+          "bundled": true,
+          "requires": {
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "bundled": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "2.0.0",
+              "bundled": true
+            },
+            "string-width": {
+              "version": "3.1.0",
+              "bundled": true,
+              "requires": {
+                "emoji-regex": "^7.0.1",
+                "is-fullwidth-code-point": "^2.0.0",
+                "strip-ansi": "^5.1.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "5.2.0",
+              "bundled": true,
+              "requires": {
+                "ansi-regex": "^4.1.0"
+              }
+            }
+          }
+        },
+        "clone": {
+          "version": "1.0.4",
+          "bundled": true
+        },
+        "cmd-shim": {
+          "version": "3.0.3",
+          "bundled": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "mkdirp": "~0.5.0"
+          }
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "color-convert": {
+          "version": "1.9.1",
+          "bundled": true,
+          "requires": {
+            "color-name": "^1.1.1"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "bundled": true
+        },
+        "colors": {
+          "version": "1.3.3",
+          "bundled": true,
+          "optional": true
+        },
+        "columnify": {
+          "version": "1.5.4",
+          "bundled": true,
+          "requires": {
+            "strip-ansi": "^3.0.0",
+            "wcwidth": "^1.0.0"
+          }
+        },
+        "combined-stream": {
+          "version": "1.0.6",
+          "bundled": true,
+          "requires": {
+            "delayed-stream": "~1.0.0"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true
+        },
+        "concat-stream": {
+          "version": "1.6.2",
+          "bundled": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "inherits": "^2.0.3",
+            "readable-stream": "^2.2.2",
+            "typedarray": "^0.0.6"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "config-chain": {
+          "version": "1.1.12",
+          "bundled": true,
+          "requires": {
+            "ini": "^1.3.4",
+            "proto-list": "~1.2.1"
+          }
+        },
+        "configstore": {
+          "version": "3.1.5",
+          "bundled": true,
+          "requires": {
+            "dot-prop": "^4.2.1",
+            "graceful-fs": "^4.1.2",
+            "make-dir": "^1.0.0",
+            "unique-string": "^1.0.0",
+            "write-file-atomic": "^2.0.0",
+            "xdg-basedir": "^3.0.0"
+          }
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "copy-concurrently": {
+          "version": "1.0.5",
+          "bundled": true,
+          "requires": {
+            "aproba": "^1.1.1",
+            "fs-write-stream-atomic": "^1.0.8",
+            "iferr": "^0.1.5",
+            "mkdirp": "^0.5.1",
+            "rimraf": "^2.5.4",
+            "run-queue": "^1.0.0"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true
+            },
+            "iferr": {
+              "version": "0.1.5",
+              "bundled": true
+            }
+          }
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "create-error-class": {
+          "version": "3.0.2",
+          "bundled": true,
+          "requires": {
+            "capture-stack-trace": "^1.0.0"
+          }
+        },
+        "cross-spawn": {
+          "version": "5.1.0",
+          "bundled": true,
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          },
+          "dependencies": {
+            "lru-cache": {
+              "version": "4.1.5",
+              "bundled": true,
+              "requires": {
+                "pseudomap": "^1.0.2",
+                "yallist": "^2.1.2"
+              }
+            },
+            "yallist": {
+              "version": "2.1.2",
+              "bundled": true
+            }
+          }
+        },
+        "crypto-random-string": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "cyclist": {
+          "version": "0.2.2",
+          "bundled": true
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
+          "requires": {
+            "assert-plus": "^1.0.0"
+          }
+        },
+        "debug": {
+          "version": "3.1.0",
+          "bundled": true,
+          "requires": {
+            "ms": "2.0.0"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.0.0",
+              "bundled": true
+            }
+          }
+        },
+        "debuglog": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "decamelize": {
+          "version": "1.2.0",
+          "bundled": true
+        },
+        "decode-uri-component": {
+          "version": "0.2.0",
+          "bundled": true
+        },
+        "deep-extend": {
+          "version": "0.6.0",
+          "bundled": true
+        },
+        "defaults": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "clone": "^1.0.2"
+          }
+        },
+        "define-properties": {
+          "version": "1.1.3",
+          "bundled": true,
+          "requires": {
+            "object-keys": "^1.0.12"
+          }
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "detect-indent": {
+          "version": "5.0.0",
+          "bundled": true
+        },
+        "detect-newline": {
+          "version": "2.1.0",
+          "bundled": true
+        },
+        "dezalgo": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "asap": "^2.0.0",
+            "wrappy": "1"
+          }
+        },
+        "dot-prop": {
+          "version": "4.2.1",
+          "bundled": true,
+          "requires": {
+            "is-obj": "^1.0.0"
+          }
+        },
+        "dotenv": {
+          "version": "5.0.1",
+          "bundled": true
+        },
+        "duplexer3": {
+          "version": "0.1.4",
+          "bundled": true
+        },
+        "duplexify": {
+          "version": "3.6.0",
+          "bundled": true,
+          "requires": {
+            "end-of-stream": "^1.0.0",
+            "inherits": "^2.0.1",
+            "readable-stream": "^2.0.0",
+            "stream-shift": "^1.0.0"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "ecc-jsbn": {
+          "version": "0.1.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "~0.1.0",
+            "safer-buffer": "^2.1.0"
+          }
+        },
+        "editor": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "emoji-regex": {
+          "version": "7.0.3",
+          "bundled": true
+        },
+        "encoding": {
+          "version": "0.1.12",
+          "bundled": true,
+          "requires": {
+            "iconv-lite": "~0.4.13"
+          }
+        },
+        "end-of-stream": {
+          "version": "1.4.1",
+          "bundled": true,
+          "requires": {
+            "once": "^1.4.0"
+          }
+        },
+        "env-paths": {
+          "version": "2.2.0",
+          "bundled": true
+        },
+        "err-code": {
+          "version": "1.1.2",
+          "bundled": true
+        },
+        "errno": {
+          "version": "0.1.7",
+          "bundled": true,
+          "requires": {
+            "prr": "~1.0.1"
+          }
+        },
+        "es-abstract": {
+          "version": "1.12.0",
+          "bundled": true,
+          "requires": {
+            "es-to-primitive": "^1.1.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.1",
+            "is-callable": "^1.1.3",
+            "is-regex": "^1.0.4"
+          }
+        },
+        "es-to-primitive": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "is-callable": "^1.1.4",
+            "is-date-object": "^1.0.1",
+            "is-symbol": "^1.0.2"
+          }
+        },
+        "es6-promise": {
+          "version": "4.2.8",
+          "bundled": true
+        },
+        "es6-promisify": {
+          "version": "5.0.0",
+          "bundled": true,
+          "requires": {
+            "es6-promise": "^4.0.3"
+          }
+        },
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "bundled": true
+        },
+        "execa": {
+          "version": "0.7.0",
+          "bundled": true,
+          "requires": {
+            "cross-spawn": "^5.0.1",
+            "get-stream": "^3.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          },
+          "dependencies": {
+            "get-stream": {
+              "version": "3.0.0",
+              "bundled": true
+            }
+          }
+        },
+        "extend": {
+          "version": "3.0.2",
+          "bundled": true
+        },
+        "extsprintf": {
+          "version": "1.3.0",
+          "bundled": true
+        },
+        "fast-json-stable-stringify": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "figgy-pudding": {
+          "version": "3.5.1",
+          "bundled": true
+        },
+        "find-npm-prefix": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "flush-write-stream": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "readable-stream": "^2.0.4"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "bundled": true
+        },
+        "form-data": {
+          "version": "2.3.2",
+          "bundled": true,
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "from2": {
+          "version": "2.3.0",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "readable-stream": "^2.0.0"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "fs-minipass": {
+          "version": "1.2.7",
+          "bundled": true,
+          "requires": {
+            "minipass": "^2.6.0"
+          },
+          "dependencies": {
+            "minipass": {
+              "version": "2.9.0",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            }
+          }
+        },
+        "fs-vacuum": {
+          "version": "1.2.10",
+          "bundled": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "path-is-inside": "^1.0.1",
+            "rimraf": "^2.5.2"
+          }
+        },
+        "fs-write-stream-atomic": {
+          "version": "1.0.10",
+          "bundled": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "iferr": "^0.1.5",
+            "imurmurhash": "^0.1.4",
+            "readable-stream": "1 || 2"
+          },
+          "dependencies": {
+            "iferr": {
+              "version": "0.1.5",
+              "bundled": true
+            },
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "function-bind": {
+          "version": "1.1.1",
+          "bundled": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "requires": {
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "bundled": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            }
+          }
+        },
+        "genfun": {
+          "version": "5.0.0",
+          "bundled": true
+        },
+        "gentle-fs": {
+          "version": "2.3.1",
+          "bundled": true,
+          "requires": {
+            "aproba": "^1.1.2",
+            "chownr": "^1.1.2",
+            "cmd-shim": "^3.0.3",
+            "fs-vacuum": "^1.2.10",
+            "graceful-fs": "^4.1.11",
+            "iferr": "^0.1.5",
+            "infer-owner": "^1.0.4",
+            "mkdirp": "^0.5.1",
+            "path-is-inside": "^1.0.2",
+            "read-cmd-shim": "^1.0.1",
+            "slide": "^1.1.6"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true
+            },
+            "iferr": {
+              "version": "0.1.5",
+              "bundled": true
+            }
+          }
+        },
+        "get-caller-file": {
+          "version": "2.0.5",
+          "bundled": true
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "bundled": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "bundled": true,
+          "requires": {
+            "assert-plus": "^1.0.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.6",
+          "bundled": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "global-dirs": {
+          "version": "0.1.1",
+          "bundled": true,
+          "requires": {
+            "ini": "^1.3.4"
+          }
+        },
+        "got": {
+          "version": "6.7.1",
+          "bundled": true,
+          "requires": {
+            "create-error-class": "^3.0.0",
+            "duplexer3": "^0.1.4",
+            "get-stream": "^3.0.0",
+            "is-redirect": "^1.0.0",
+            "is-retry-allowed": "^1.0.0",
+            "is-stream": "^1.0.0",
+            "lowercase-keys": "^1.0.0",
+            "safe-buffer": "^5.0.1",
+            "timed-out": "^4.0.0",
+            "unzip-response": "^2.0.1",
+            "url-parse-lax": "^1.0.0"
+          },
+          "dependencies": {
+            "get-stream": {
+              "version": "3.0.0",
+              "bundled": true
+            }
+          }
+        },
+        "graceful-fs": {
+          "version": "4.2.4",
+          "bundled": true
+        },
+        "har-schema": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "har-validator": {
+          "version": "5.1.5",
+          "bundled": true,
+          "requires": {
+            "ajv": "^6.12.3",
+            "har-schema": "^2.0.0"
+          },
+          "dependencies": {
+            "ajv": {
+              "version": "6.12.6",
+              "bundled": true,
+              "requires": {
+                "fast-deep-equal": "^3.1.1",
+                "fast-json-stable-stringify": "^2.0.0",
+                "json-schema-traverse": "^0.4.1",
+                "uri-js": "^4.2.2"
+              }
+            },
+            "fast-deep-equal": {
+              "version": "3.1.3",
+              "bundled": true
+            },
+            "json-schema-traverse": {
+              "version": "0.4.1",
+              "bundled": true
+            }
+          }
+        },
+        "has": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.1"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "bundled": true
+        },
+        "has-symbols": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true
+        },
+        "hosted-git-info": {
+          "version": "2.8.8",
+          "bundled": true
+        },
+        "http-cache-semantics": {
+          "version": "3.8.1",
+          "bundled": true
+        },
+        "http-proxy-agent": {
+          "version": "2.1.0",
+          "bundled": true,
+          "requires": {
+            "agent-base": "4",
+            "debug": "3.1.0"
+          }
+        },
+        "http-signature": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "assert-plus": "^1.0.0",
+            "jsprim": "^1.2.2",
+            "sshpk": "^1.7.0"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "2.2.4",
+          "bundled": true,
+          "requires": {
+            "agent-base": "^4.3.0",
+            "debug": "^3.1.0"
+          }
+        },
+        "humanize-ms": {
+          "version": "1.2.1",
+          "bundled": true,
+          "requires": {
+            "ms": "^2.0.0"
+          }
+        },
+        "iconv-lite": {
+          "version": "0.4.23",
+          "bundled": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
+        "iferr": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "ignore-walk": {
+          "version": "3.0.3",
+          "bundled": true,
+          "requires": {
+            "minimatch": "^3.0.4"
+          }
+        },
+        "import-lazy": {
+          "version": "2.1.0",
+          "bundled": true
+        },
+        "imurmurhash": {
+          "version": "0.1.4",
+          "bundled": true
+        },
+        "infer-owner": {
+          "version": "1.0.4",
+          "bundled": true
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "requires": {
+            "once": "^1.3.0",
+            "wrappy": "1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "bundled": true
+        },
+        "ini": {
+          "version": "1.3.8",
+          "bundled": true
+        },
+        "init-package-json": {
+          "version": "1.10.3",
+          "bundled": true,
+          "requires": {
+            "glob": "^7.1.1",
+            "npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0",
+            "promzard": "^0.3.0",
+            "read": "~1.0.1",
+            "read-package-json": "1 || 2",
+            "semver": "2.x || 3.x || 4 || 5",
+            "validate-npm-package-license": "^3.0.1",
+            "validate-npm-package-name": "^3.0.0"
+          }
+        },
+        "ip": {
+          "version": "1.1.5",
+          "bundled": true
+        },
+        "ip-regex": {
+          "version": "2.1.0",
+          "bundled": true
+        },
+        "is-callable": {
+          "version": "1.1.4",
+          "bundled": true
+        },
+        "is-ci": {
+          "version": "1.2.1",
+          "bundled": true,
+          "requires": {
+            "ci-info": "^1.5.0"
+          },
+          "dependencies": {
+            "ci-info": {
+              "version": "1.6.0",
+              "bundled": true
+            }
+          }
+        },
+        "is-cidr": {
+          "version": "3.0.0",
+          "bundled": true,
+          "requires": {
+            "cidr-regex": "^2.0.10"
+          }
+        },
+        "is-date-object": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "is-installed-globally": {
+          "version": "0.1.0",
+          "bundled": true,
+          "requires": {
+            "global-dirs": "^0.1.0",
+            "is-path-inside": "^1.0.0"
+          }
+        },
+        "is-npm": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "is-obj": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "is-path-inside": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "path-is-inside": "^1.0.1"
+          }
+        },
+        "is-redirect": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "is-regex": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "has": "^1.0.1"
+          }
+        },
+        "is-retry-allowed": {
+          "version": "1.2.0",
+          "bundled": true
+        },
+        "is-stream": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "is-symbol": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "has-symbols": "^1.0.0"
+          }
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "isexe": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "bundled": true
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "optional": true
+        },
+        "json-parse-better-errors": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "bundled": true
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "bundled": true
+        },
+        "jsonparse": {
+          "version": "1.3.1",
+          "bundled": true
+        },
+        "jsprim": {
+          "version": "1.4.1",
+          "bundled": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.3.0",
+            "json-schema": "0.2.3",
+            "verror": "1.10.0"
+          }
+        },
+        "latest-version": {
+          "version": "3.1.0",
+          "bundled": true,
+          "requires": {
+            "package-json": "^4.0.0"
+          }
+        },
+        "lazy-property": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "libcipm": {
+          "version": "4.0.8",
+          "bundled": true,
+          "requires": {
+            "bin-links": "^1.1.2",
+            "bluebird": "^3.5.1",
+            "figgy-pudding": "^3.5.1",
+            "find-npm-prefix": "^1.0.2",
+            "graceful-fs": "^4.1.11",
+            "ini": "^1.3.5",
+            "lock-verify": "^2.1.0",
+            "mkdirp": "^0.5.1",
+            "npm-lifecycle": "^3.0.0",
+            "npm-logical-tree": "^1.2.1",
+            "npm-package-arg": "^6.1.0",
+            "pacote": "^9.1.0",
+            "read-package-json": "^2.0.13",
+            "rimraf": "^2.6.2",
+            "worker-farm": "^1.6.0"
+          }
+        },
+        "libnpm": {
+          "version": "3.0.1",
+          "bundled": true,
+          "requires": {
+            "bin-links": "^1.1.2",
+            "bluebird": "^3.5.3",
+            "find-npm-prefix": "^1.0.2",
+            "libnpmaccess": "^3.0.2",
+            "libnpmconfig": "^1.2.1",
+            "libnpmhook": "^5.0.3",
+            "libnpmorg": "^1.0.1",
+            "libnpmpublish": "^1.1.2",
+            "libnpmsearch": "^2.0.2",
+            "libnpmteam": "^1.0.2",
+            "lock-verify": "^2.0.2",
+            "npm-lifecycle": "^3.0.0",
+            "npm-logical-tree": "^1.2.1",
+            "npm-package-arg": "^6.1.0",
+            "npm-profile": "^4.0.2",
+            "npm-registry-fetch": "^4.0.0",
+            "npmlog": "^4.1.2",
+            "pacote": "^9.5.3",
+            "read-package-json": "^2.0.13",
+            "stringify-package": "^1.0.0"
+          }
+        },
+        "libnpmaccess": {
+          "version": "3.0.2",
+          "bundled": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "get-stream": "^4.0.0",
+            "npm-package-arg": "^6.1.0",
+            "npm-registry-fetch": "^4.0.0"
+          }
+        },
+        "libnpmconfig": {
+          "version": "1.2.1",
+          "bundled": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "find-up": "^3.0.0",
+            "ini": "^1.3.5"
+          },
+          "dependencies": {
+            "find-up": {
+              "version": "3.0.0",
+              "bundled": true,
+              "requires": {
+                "locate-path": "^3.0.0"
+              }
+            },
+            "locate-path": {
+              "version": "3.0.0",
+              "bundled": true,
+              "requires": {
+                "p-locate": "^3.0.0",
+                "path-exists": "^3.0.0"
+              }
+            },
+            "p-limit": {
+              "version": "2.2.0",
+              "bundled": true,
+              "requires": {
+                "p-try": "^2.0.0"
+              }
+            },
+            "p-locate": {
+              "version": "3.0.0",
+              "bundled": true,
+              "requires": {
+                "p-limit": "^2.0.0"
+              }
+            },
+            "p-try": {
+              "version": "2.2.0",
+              "bundled": true
+            }
+          }
+        },
+        "libnpmhook": {
+          "version": "5.0.3",
+          "bundled": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.4.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^4.0.0"
+          }
+        },
+        "libnpmorg": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.4.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^4.0.0"
+          }
+        },
+        "libnpmpublish": {
+          "version": "1.1.2",
+          "bundled": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.5.1",
+            "get-stream": "^4.0.0",
+            "lodash.clonedeep": "^4.5.0",
+            "normalize-package-data": "^2.4.0",
+            "npm-package-arg": "^6.1.0",
+            "npm-registry-fetch": "^4.0.0",
+            "semver": "^5.5.1",
+            "ssri": "^6.0.1"
+          }
+        },
+        "libnpmsearch": {
+          "version": "2.0.2",
+          "bundled": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^4.0.0"
+          }
+        },
+        "libnpmteam": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.4.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^4.0.0"
+          }
+        },
+        "libnpx": {
+          "version": "10.2.4",
+          "bundled": true,
+          "requires": {
+            "dotenv": "^5.0.1",
+            "npm-package-arg": "^6.0.0",
+            "rimraf": "^2.6.2",
+            "safe-buffer": "^5.1.0",
+            "update-notifier": "^2.3.0",
+            "which": "^1.3.0",
+            "y18n": "^4.0.0",
+            "yargs": "^14.2.3"
+          }
+        },
+        "lock-verify": {
+          "version": "2.1.0",
+          "bundled": true,
+          "requires": {
+            "npm-package-arg": "^6.1.0",
+            "semver": "^5.4.1"
+          }
+        },
+        "lockfile": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "signal-exit": "^3.0.2"
+          }
+        },
+        "lodash._baseindexof": {
+          "version": "3.1.0",
+          "bundled": true
+        },
+        "lodash._baseuniq": {
+          "version": "4.6.0",
+          "bundled": true,
+          "requires": {
+            "lodash._createset": "~4.0.0",
+            "lodash._root": "~3.0.0"
+          }
+        },
+        "lodash._bindcallback": {
+          "version": "3.0.1",
+          "bundled": true
+        },
+        "lodash._cacheindexof": {
+          "version": "3.0.2",
+          "bundled": true
+        },
+        "lodash._createcache": {
+          "version": "3.1.2",
+          "bundled": true,
+          "requires": {
+            "lodash._getnative": "^3.0.0"
+          }
+        },
+        "lodash._createset": {
+          "version": "4.0.3",
+          "bundled": true
+        },
+        "lodash._getnative": {
+          "version": "3.9.1",
+          "bundled": true
+        },
+        "lodash._root": {
+          "version": "3.0.1",
+          "bundled": true
+        },
+        "lodash.clonedeep": {
+          "version": "4.5.0",
+          "bundled": true
+        },
+        "lodash.restparam": {
+          "version": "3.6.1",
+          "bundled": true
+        },
+        "lodash.union": {
+          "version": "4.6.0",
+          "bundled": true
+        },
+        "lodash.uniq": {
+          "version": "4.5.0",
+          "bundled": true
+        },
+        "lodash.without": {
+          "version": "4.4.0",
+          "bundled": true
+        },
+        "lowercase-keys": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "bundled": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "make-dir": {
+          "version": "1.3.0",
+          "bundled": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "make-fetch-happen": {
+          "version": "5.0.2",
+          "bundled": true,
+          "requires": {
+            "agentkeepalive": "^3.4.1",
+            "cacache": "^12.0.0",
+            "http-cache-semantics": "^3.8.1",
+            "http-proxy-agent": "^2.1.0",
+            "https-proxy-agent": "^2.2.3",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "node-fetch-npm": "^2.0.2",
+            "promise-retry": "^1.1.1",
+            "socks-proxy-agent": "^4.0.0",
+            "ssri": "^6.0.0"
+          }
+        },
+        "meant": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "mime-db": {
+          "version": "1.35.0",
+          "bundled": true
+        },
+        "mime-types": {
+          "version": "2.1.19",
+          "bundled": true,
+          "requires": {
+            "mime-db": "~1.35.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "bundled": true
+        },
+        "minizlib": {
+          "version": "1.3.3",
+          "bundled": true,
+          "requires": {
+            "minipass": "^2.9.0"
+          },
+          "dependencies": {
+            "minipass": {
+              "version": "2.9.0",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            }
+          }
+        },
+        "mississippi": {
+          "version": "3.0.0",
+          "bundled": true,
+          "requires": {
+            "concat-stream": "^1.5.0",
+            "duplexify": "^3.4.2",
+            "end-of-stream": "^1.1.0",
+            "flush-write-stream": "^1.0.0",
+            "from2": "^2.1.0",
+            "parallel-transform": "^1.1.0",
+            "pump": "^3.0.0",
+            "pumpify": "^1.3.3",
+            "stream-each": "^1.1.0",
+            "through2": "^2.0.0"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.5",
+          "bundled": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.5",
+              "bundled": true
+            }
+          }
+        },
+        "move-concurrently": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "aproba": "^1.1.1",
+            "copy-concurrently": "^1.0.0",
+            "fs-write-stream-atomic": "^1.0.8",
+            "mkdirp": "^0.5.1",
+            "rimraf": "^2.5.4",
+            "run-queue": "^1.0.3"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true
+            }
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "bundled": true
+        },
+        "mute-stream": {
+          "version": "0.0.7",
+          "bundled": true
+        },
+        "node-fetch-npm": {
+          "version": "2.0.2",
+          "bundled": true,
+          "requires": {
+            "encoding": "^0.1.11",
+            "json-parse-better-errors": "^1.0.0",
+            "safe-buffer": "^5.1.1"
+          }
+        },
+        "node-gyp": {
+          "version": "5.1.0",
+          "bundled": true,
+          "requires": {
+            "env-paths": "^2.2.0",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.2.2",
+            "mkdirp": "^0.5.1",
+            "nopt": "^4.0.1",
+            "npmlog": "^4.1.2",
+            "request": "^2.88.0",
+            "rimraf": "^2.6.3",
+            "semver": "^5.7.1",
+            "tar": "^4.4.12",
+            "which": "^1.3.1"
+          }
+        },
+        "nopt": {
+          "version": "4.0.3",
+          "bundled": true,
+          "requires": {
+            "abbrev": "1",
+            "osenv": "^0.1.4"
+          }
+        },
+        "normalize-package-data": {
+          "version": "2.5.0",
+          "bundled": true,
+          "requires": {
+            "hosted-git-info": "^2.1.4",
+            "resolve": "^1.10.0",
+            "semver": "2 || 3 || 4 || 5",
+            "validate-npm-package-license": "^3.0.1"
+          },
+          "dependencies": {
+            "resolve": {
+              "version": "1.10.0",
+              "bundled": true,
+              "requires": {
+                "path-parse": "^1.0.6"
+              }
+            }
+          }
+        },
+        "npm-audit-report": {
+          "version": "1.3.3",
+          "bundled": true,
+          "requires": {
+            "cli-table3": "^0.5.0",
+            "console-control-strings": "^1.1.0"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "npm-normalize-package-bin": "^1.0.1"
+          }
+        },
+        "npm-cache-filename": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "npm-install-checks": {
+          "version": "3.0.2",
+          "bundled": true,
+          "requires": {
+            "semver": "^2.3.0 || 3.x || 4 || 5"
+          }
+        },
+        "npm-lifecycle": {
+          "version": "3.1.5",
+          "bundled": true,
+          "requires": {
+            "byline": "^5.0.0",
+            "graceful-fs": "^4.1.15",
+            "node-gyp": "^5.0.2",
+            "resolve-from": "^4.0.0",
+            "slide": "^1.1.6",
+            "uid-number": "0.0.6",
+            "umask": "^1.1.0",
+            "which": "^1.3.1"
+          }
+        },
+        "npm-logical-tree": {
+          "version": "1.2.1",
+          "bundled": true
+        },
+        "npm-normalize-package-bin": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "npm-package-arg": {
+          "version": "6.1.1",
+          "bundled": true,
+          "requires": {
+            "hosted-git-info": "^2.7.1",
+            "osenv": "^0.1.5",
+            "semver": "^5.6.0",
+            "validate-npm-package-name": "^3.0.0"
+          }
+        },
+        "npm-packlist": {
+          "version": "1.4.8",
+          "bundled": true,
+          "requires": {
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1",
+            "npm-normalize-package-bin": "^1.0.1"
+          }
+        },
+        "npm-pick-manifest": {
+          "version": "3.0.2",
+          "bundled": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "npm-package-arg": "^6.0.0",
+            "semver": "^5.4.1"
+          }
+        },
+        "npm-profile": {
+          "version": "4.0.4",
+          "bundled": true,
+          "requires": {
+            "aproba": "^1.1.2 || 2",
+            "figgy-pudding": "^3.4.1",
+            "npm-registry-fetch": "^4.0.0"
+          }
+        },
+        "npm-registry-fetch": {
+          "version": "4.0.7",
+          "bundled": true,
+          "requires": {
+            "JSONStream": "^1.3.4",
+            "bluebird": "^3.5.1",
+            "figgy-pudding": "^3.4.1",
+            "lru-cache": "^5.1.1",
+            "make-fetch-happen": "^5.0.0",
+            "npm-package-arg": "^6.1.0",
+            "safe-buffer": "^5.2.0"
+          },
+          "dependencies": {
+            "safe-buffer": {
+              "version": "5.2.1",
+              "bundled": true
+            }
+          }
+        },
+        "npm-run-path": {
+          "version": "2.0.2",
+          "bundled": true,
+          "requires": {
+            "path-key": "^2.0.0"
+          }
+        },
+        "npm-user-validate": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "requires": {
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "oauth-sign": {
+          "version": "0.9.0",
+          "bundled": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true
+        },
+        "object-keys": {
+          "version": "1.0.12",
+          "bundled": true
+        },
+        "object.getownpropertydescriptors": {
+          "version": "2.0.3",
+          "bundled": true,
+          "requires": {
+            "define-properties": "^1.1.2",
+            "es-abstract": "^1.5.1"
+          }
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "requires": {
+            "wrappy": "1"
+          }
+        },
+        "opener": {
+          "version": "1.5.2",
+          "bundled": true
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "requires": {
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
+          }
+        },
+        "p-finally": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "package-json": {
+          "version": "4.0.1",
+          "bundled": true,
+          "requires": {
+            "got": "^6.7.1",
+            "registry-auth-token": "^3.0.1",
+            "registry-url": "^3.0.3",
+            "semver": "^5.1.0"
+          }
+        },
+        "pacote": {
+          "version": "9.5.12",
+          "bundled": true,
+          "requires": {
+            "bluebird": "^3.5.3",
+            "cacache": "^12.0.2",
+            "chownr": "^1.1.2",
+            "figgy-pudding": "^3.5.1",
+            "get-stream": "^4.1.0",
+            "glob": "^7.1.3",
+            "infer-owner": "^1.0.4",
+            "lru-cache": "^5.1.1",
+            "make-fetch-happen": "^5.0.0",
+            "minimatch": "^3.0.4",
+            "minipass": "^2.3.5",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "normalize-package-data": "^2.4.0",
+            "npm-normalize-package-bin": "^1.0.0",
+            "npm-package-arg": "^6.1.0",
+            "npm-packlist": "^1.1.12",
+            "npm-pick-manifest": "^3.0.0",
+            "npm-registry-fetch": "^4.0.0",
+            "osenv": "^0.1.5",
+            "promise-inflight": "^1.0.1",
+            "promise-retry": "^1.1.1",
+            "protoduck": "^5.0.1",
+            "rimraf": "^2.6.2",
+            "safe-buffer": "^5.1.2",
+            "semver": "^5.6.0",
+            "ssri": "^6.0.1",
+            "tar": "^4.4.10",
+            "unique-filename": "^1.1.1",
+            "which": "^1.3.1"
+          },
+          "dependencies": {
+            "minipass": {
+              "version": "2.9.0",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            }
+          }
+        },
+        "parallel-transform": {
+          "version": "1.1.0",
+          "bundled": true,
+          "requires": {
+            "cyclist": "~0.2.2",
+            "inherits": "^2.0.3",
+            "readable-stream": "^2.1.5"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "path-exists": {
+          "version": "3.0.0",
+          "bundled": true
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "path-is-inside": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "path-key": {
+          "version": "2.0.1",
+          "bundled": true
+        },
+        "path-parse": {
+          "version": "1.0.6",
+          "bundled": true
+        },
+        "performance-now": {
+          "version": "2.1.0",
+          "bundled": true
+        },
+        "pify": {
+          "version": "3.0.0",
+          "bundled": true
+        },
+        "prepend-http": {
+          "version": "1.0.4",
+          "bundled": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "promise-inflight": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "promise-retry": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "err-code": "^1.0.0",
+            "retry": "^0.10.0"
+          },
+          "dependencies": {
+            "retry": {
+              "version": "0.10.1",
+              "bundled": true
+            }
+          }
+        },
+        "promzard": {
+          "version": "0.3.0",
+          "bundled": true,
+          "requires": {
+            "read": "1"
+          }
+        },
+        "proto-list": {
+          "version": "1.2.4",
+          "bundled": true
+        },
+        "protoduck": {
+          "version": "5.0.1",
+          "bundled": true,
+          "requires": {
+            "genfun": "^5.0.0"
+          }
+        },
+        "prr": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "pseudomap": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "psl": {
+          "version": "1.1.29",
+          "bundled": true
+        },
+        "pump": {
+          "version": "3.0.0",
+          "bundled": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        },
+        "pumpify": {
+          "version": "1.5.1",
+          "bundled": true,
+          "requires": {
+            "duplexify": "^3.6.0",
+            "inherits": "^2.0.3",
+            "pump": "^2.0.0"
+          },
+          "dependencies": {
+            "pump": {
+              "version": "2.0.1",
+              "bundled": true,
+              "requires": {
+                "end-of-stream": "^1.1.0",
+                "once": "^1.3.1"
+              }
+            }
+          }
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true
+        },
+        "qrcode-terminal": {
+          "version": "0.12.0",
+          "bundled": true
+        },
+        "qs": {
+          "version": "6.5.2",
+          "bundled": true
+        },
+        "query-string": {
+          "version": "6.8.2",
+          "bundled": true,
+          "requires": {
+            "decode-uri-component": "^0.2.0",
+            "split-on-first": "^1.0.0",
+            "strict-uri-encode": "^2.0.0"
+          }
+        },
+        "qw": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "rc": {
+          "version": "1.2.8",
+          "bundled": true,
+          "requires": {
+            "deep-extend": "^0.6.0",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
+          }
+        },
+        "read": {
+          "version": "1.0.7",
+          "bundled": true,
+          "requires": {
+            "mute-stream": "~0.0.4"
+          }
+        },
+        "read-cmd-shim": {
+          "version": "1.0.5",
+          "bundled": true,
+          "requires": {
+            "graceful-fs": "^4.1.2"
+          }
+        },
+        "read-installed": {
+          "version": "4.0.3",
+          "bundled": true,
+          "requires": {
+            "debuglog": "^1.0.1",
+            "graceful-fs": "^4.1.2",
+            "read-package-json": "^2.0.0",
+            "readdir-scoped-modules": "^1.0.0",
+            "semver": "2 || 3 || 4 || 5",
+            "slide": "~1.1.3",
+            "util-extend": "^1.0.1"
+          }
+        },
+        "read-package-json": {
+          "version": "2.1.1",
+          "bundled": true,
+          "requires": {
+            "glob": "^7.1.1",
+            "graceful-fs": "^4.1.2",
+            "json-parse-better-errors": "^1.0.1",
+            "normalize-package-data": "^2.0.0",
+            "npm-normalize-package-bin": "^1.0.0"
+          }
+        },
+        "read-package-tree": {
+          "version": "5.3.1",
+          "bundled": true,
+          "requires": {
+            "read-package-json": "^2.0.0",
+            "readdir-scoped-modules": "^1.0.0",
+            "util-promisify": "^2.1.0"
+          }
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "readdir-scoped-modules": {
+          "version": "1.1.0",
+          "bundled": true,
+          "requires": {
+            "debuglog": "^1.0.1",
+            "dezalgo": "^1.0.0",
+            "graceful-fs": "^4.1.2",
+            "once": "^1.3.0"
+          }
+        },
+        "registry-auth-token": {
+          "version": "3.4.0",
+          "bundled": true,
+          "requires": {
+            "rc": "^1.1.6",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "registry-url": {
+          "version": "3.1.0",
+          "bundled": true,
+          "requires": {
+            "rc": "^1.0.1"
+          }
+        },
+        "request": {
+          "version": "2.88.0",
+          "bundled": true,
+          "requires": {
+            "aws-sign2": "~0.7.0",
+            "aws4": "^1.8.0",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.6",
+            "extend": "~3.0.2",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.3.2",
+            "har-validator": "~5.1.0",
+            "http-signature": "~1.2.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.19",
+            "oauth-sign": "~0.9.0",
+            "performance-now": "^2.1.0",
+            "qs": "~6.5.2",
+            "safe-buffer": "^5.1.2",
+            "tough-cookie": "~2.4.3",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.3.2"
+          }
+        },
+        "require-directory": {
+          "version": "2.1.1",
+          "bundled": true
+        },
+        "require-main-filename": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "resolve-from": {
+          "version": "4.0.0",
+          "bundled": true
+        },
+        "retry": {
+          "version": "0.12.0",
+          "bundled": true
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "bundled": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "run-queue": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "aproba": "^1.1.1"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true
+            }
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "bundled": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true
+        },
+        "semver": {
+          "version": "5.7.1",
+          "bundled": true
+        },
+        "semver-diff": {
+          "version": "2.1.0",
+          "bundled": true,
+          "requires": {
+            "semver": "^5.0.3"
+          }
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "sha": {
+          "version": "3.0.0",
+          "bundled": true,
+          "requires": {
+            "graceful-fs": "^4.1.2"
+          }
+        },
+        "shebang-command": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "shebang-regex": "^1.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true
+        },
+        "slide": {
+          "version": "1.1.6",
+          "bundled": true
+        },
+        "smart-buffer": {
+          "version": "4.1.0",
+          "bundled": true
+        },
+        "socks": {
+          "version": "2.3.3",
+          "bundled": true,
+          "requires": {
+            "ip": "1.1.5",
+            "smart-buffer": "^4.1.0"
+          }
+        },
+        "socks-proxy-agent": {
+          "version": "4.0.2",
+          "bundled": true,
+          "requires": {
+            "agent-base": "~4.2.1",
+            "socks": "~2.3.2"
+          },
+          "dependencies": {
+            "agent-base": {
+              "version": "4.2.1",
+              "bundled": true,
+              "requires": {
+                "es6-promisify": "^5.0.0"
+              }
+            }
+          }
+        },
+        "sorted-object": {
+          "version": "2.0.1",
+          "bundled": true
+        },
+        "sorted-union-stream": {
+          "version": "2.1.3",
+          "bundled": true,
+          "requires": {
+            "from2": "^1.3.0",
+            "stream-iterate": "^1.1.0"
+          },
+          "dependencies": {
+            "from2": {
+              "version": "1.3.0",
+              "bundled": true,
+              "requires": {
+                "inherits": "~2.0.1",
+                "readable-stream": "~1.1.10"
+              }
+            },
+            "isarray": {
+              "version": "0.0.1",
+              "bundled": true
+            },
+            "readable-stream": {
+              "version": "1.1.14",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.1",
+                "isarray": "0.0.1",
+                "string_decoder": "~0.10.x"
+              }
+            },
+            "string_decoder": {
+              "version": "0.10.31",
+              "bundled": true
+            }
+          }
+        },
+        "spdx-correct": {
+          "version": "3.0.0",
+          "bundled": true,
+          "requires": {
+            "spdx-expression-parse": "^3.0.0",
+            "spdx-license-ids": "^3.0.0"
+          }
+        },
+        "spdx-exceptions": {
+          "version": "2.1.0",
+          "bundled": true
+        },
+        "spdx-expression-parse": {
+          "version": "3.0.0",
+          "bundled": true,
+          "requires": {
+            "spdx-exceptions": "^2.1.0",
+            "spdx-license-ids": "^3.0.0"
+          }
+        },
+        "spdx-license-ids": {
+          "version": "3.0.5",
+          "bundled": true
+        },
+        "split-on-first": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "sshpk": {
+          "version": "1.14.2",
+          "bundled": true,
+          "requires": {
+            "asn1": "~0.2.3",
+            "assert-plus": "^1.0.0",
+            "bcrypt-pbkdf": "^1.0.0",
+            "dashdash": "^1.12.0",
+            "ecc-jsbn": "~0.1.1",
+            "getpass": "^0.1.1",
+            "jsbn": "~0.1.0",
+            "safer-buffer": "^2.0.2",
+            "tweetnacl": "~0.14.0"
+          }
+        },
+        "ssri": {
+          "version": "6.0.1",
+          "bundled": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1"
+          }
+        },
+        "stream-each": {
+          "version": "1.2.2",
+          "bundled": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "stream-shift": "^1.0.0"
+          }
+        },
+        "stream-iterate": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "readable-stream": "^2.1.5",
+            "stream-shift": "^1.0.0"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "stream-shift": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "strict-uri-encode": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "bundled": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "3.0.0",
+              "bundled": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "2.0.0",
+              "bundled": true
+            },
+            "strip-ansi": {
+              "version": "4.0.0",
+              "bundled": true,
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "string_decoder": {
+          "version": "1.3.0",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "~5.2.0"
+          },
+          "dependencies": {
+            "safe-buffer": {
+              "version": "5.2.0",
+              "bundled": true
+            }
+          }
+        },
+        "stringify-package": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "strip-eof": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "bundled": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "tar": {
+          "version": "4.4.13",
+          "bundled": true,
+          "requires": {
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.8.6",
+            "minizlib": "^1.2.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.3"
+          },
+          "dependencies": {
+            "minipass": {
+              "version": "2.9.0",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            }
+          }
+        },
+        "term-size": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "execa": "^0.7.0"
+          }
+        },
+        "text-table": {
+          "version": "0.2.0",
+          "bundled": true
+        },
+        "through": {
+          "version": "2.3.8",
+          "bundled": true
+        },
+        "through2": {
+          "version": "2.0.3",
+          "bundled": true,
+          "requires": {
+            "readable-stream": "^2.1.5",
+            "xtend": "~4.0.1"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "timed-out": {
+          "version": "4.0.1",
+          "bundled": true
+        },
+        "tiny-relative-date": {
+          "version": "1.3.0",
+          "bundled": true
+        },
+        "tough-cookie": {
+          "version": "2.4.3",
+          "bundled": true,
+          "requires": {
+            "psl": "^1.1.24",
+            "punycode": "^1.4.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "bundled": true,
+          "optional": true
+        },
+        "typedarray": {
+          "version": "0.0.6",
+          "bundled": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "bundled": true
+        },
+        "umask": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "unique-filename": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "unique-slug": "^2.0.0"
+          }
+        },
+        "unique-slug": {
+          "version": "2.0.0",
+          "bundled": true,
+          "requires": {
+            "imurmurhash": "^0.1.4"
+          }
+        },
+        "unique-string": {
+          "version": "1.0.0",
+          "bundled": true,
+          "requires": {
+            "crypto-random-string": "^1.0.0"
+          }
+        },
+        "unpipe": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "unzip-response": {
+          "version": "2.0.1",
+          "bundled": true
+        },
+        "update-notifier": {
+          "version": "2.5.0",
+          "bundled": true,
+          "requires": {
+            "boxen": "^1.2.1",
+            "chalk": "^2.0.1",
+            "configstore": "^3.0.0",
+            "import-lazy": "^2.1.0",
+            "is-ci": "^1.0.10",
+            "is-installed-globally": "^0.1.0",
+            "is-npm": "^1.0.0",
+            "latest-version": "^3.0.0",
+            "semver-diff": "^2.0.0",
+            "xdg-basedir": "^3.0.0"
+          }
+        },
+        "uri-js": {
+          "version": "4.4.0",
+          "bundled": true,
+          "requires": {
+            "punycode": "^2.1.0"
+          },
+          "dependencies": {
+            "punycode": {
+              "version": "2.1.1",
+              "bundled": true
+            }
+          }
+        },
+        "url-parse-lax": {
+          "version": "1.0.0",
+          "bundled": true,
+          "requires": {
+            "prepend-http": "^1.0.1"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "util-extend": {
+          "version": "1.0.3",
+          "bundled": true
+        },
+        "util-promisify": {
+          "version": "2.1.0",
+          "bundled": true,
+          "requires": {
+            "object.getownpropertydescriptors": "^2.0.3"
+          }
+        },
+        "uuid": {
+          "version": "3.3.3",
+          "bundled": true
+        },
+        "validate-npm-package-license": {
+          "version": "3.0.4",
+          "bundled": true,
+          "requires": {
+            "spdx-correct": "^3.0.0",
+            "spdx-expression-parse": "^3.0.0"
+          }
+        },
+        "validate-npm-package-name": {
+          "version": "3.0.0",
+          "bundled": true,
+          "requires": {
+            "builtins": "^1.0.3"
+          }
+        },
+        "verror": {
+          "version": "1.10.0",
+          "bundled": true,
+          "requires": {
+            "assert-plus": "^1.0.0",
+            "core-util-is": "1.0.2",
+            "extsprintf": "^1.2.0"
+          }
+        },
+        "wcwidth": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "defaults": "^1.0.3"
+          }
+        },
+        "which": {
+          "version": "1.3.1",
+          "bundled": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "requires": {
+            "string-width": "^1.0.2"
+          },
+          "dependencies": {
+            "string-width": {
+              "version": "1.0.2",
+              "bundled": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            }
+          }
+        },
+        "widest-line": {
+          "version": "2.0.1",
+          "bundled": true,
+          "requires": {
+            "string-width": "^2.1.1"
+          }
+        },
+        "worker-farm": {
+          "version": "1.7.0",
+          "bundled": true,
+          "requires": {
+            "errno": "~0.1.7"
+          }
+        },
+        "wrap-ansi": {
+          "version": "5.1.0",
+          "bundled": true,
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "bundled": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "2.0.0",
+              "bundled": true
+            },
+            "string-width": {
+              "version": "3.1.0",
+              "bundled": true,
+              "requires": {
+                "emoji-regex": "^7.0.1",
+                "is-fullwidth-code-point": "^2.0.0",
+                "strip-ansi": "^5.1.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "5.2.0",
+              "bundled": true,
+              "requires": {
+                "ansi-regex": "^4.1.0"
+              }
+            }
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "write-file-atomic": {
+          "version": "2.4.3",
+          "bundled": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "imurmurhash": "^0.1.4",
+            "signal-exit": "^3.0.2"
+          }
+        },
+        "xdg-basedir": {
+          "version": "3.0.0",
+          "bundled": true
+        },
+        "xtend": {
+          "version": "4.0.1",
+          "bundled": true
+        },
+        "y18n": {
+          "version": "4.0.0",
+          "bundled": true
+        },
+        "yallist": {
+          "version": "3.0.3",
+          "bundled": true
+        },
+        "yargs": {
+          "version": "14.2.3",
+          "bundled": true,
+          "requires": {
+            "cliui": "^5.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^15.0.1"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "bundled": true
+            },
+            "find-up": {
+              "version": "3.0.0",
+              "bundled": true,
+              "requires": {
+                "locate-path": "^3.0.0"
+              }
+            },
+            "is-fullwidth-code-point": {
+              "version": "2.0.0",
+              "bundled": true
+            },
+            "locate-path": {
+              "version": "3.0.0",
+              "bundled": true,
+              "requires": {
+                "p-locate": "^3.0.0",
+                "path-exists": "^3.0.0"
+              }
+            },
+            "p-limit": {
+              "version": "2.3.0",
+              "bundled": true,
+              "requires": {
+                "p-try": "^2.0.0"
+              }
+            },
+            "p-locate": {
+              "version": "3.0.0",
+              "bundled": true,
+              "requires": {
+                "p-limit": "^2.0.0"
+              }
+            },
+            "p-try": {
+              "version": "2.2.0",
+              "bundled": true
+            },
+            "string-width": {
+              "version": "3.1.0",
+              "bundled": true,
+              "requires": {
+                "emoji-regex": "^7.0.1",
+                "is-fullwidth-code-point": "^2.0.0",
+                "strip-ansi": "^5.1.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "5.2.0",
+              "bundled": true,
+              "requires": {
+                "ansi-regex": "^4.1.0"
+              }
+            }
+          }
+        },
+        "yargs-parser": {
+          "version": "15.0.1",
+          "bundled": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          },
+          "dependencies": {
+            "camelcase": {
+              "version": "5.3.1",
+              "bundled": true
+            }
+          }
+        }
+      }
+    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -15068,12 +19387,12 @@
       }
     },
     "nth-check": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz",
+      "integrity": "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==",
       "dev": true,
       "requires": {
-        "boolbase": "~1.0.0"
+        "boolbase": "^1.0.0"
       }
     },
     "null-check": {
@@ -15137,6 +19456,16 @@
         }
       }
     },
+    "object-extended": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/object-extended/-/object-extended-0.0.7.tgz",
+      "integrity": "sha1-hP0j9WsVWCrrPoiwXLVdJDLWijM=",
+      "requires": {
+        "array-extended": "~0.0.4",
+        "extended": "~0.0.3",
+        "is-extended": "~0.0.3"
+      }
+    },
     "object-hash": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz",
@@ -15144,17 +19473,17 @@
       "dev": true
     },
     "object-inspect": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
-      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
+      "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw=="
     },
     "object-is": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz",
-      "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.4.tgz",
+      "integrity": "sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==",
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
       }
     },
     "object-keys": {
@@ -15162,12 +19491,6 @@
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
     },
-    "object-path": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.9.2.tgz",
-      "integrity": "sha1-D9mnT8X60a45aLWGvaXGMr1sBaU=",
-      "dev": true
-    },
     "object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -15175,17 +19498,25 @@
       "dev": true,
       "requires": {
         "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
       }
     },
     "object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
       "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
       }
     },
     "object.defaults": {
@@ -15208,40 +19539,110 @@
           "requires": {
             "for-in": "^1.0.1"
           }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
         }
       }
     },
     "object.entries": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz",
-      "integrity": "sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==",
-      "dev": true,
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.3.tgz",
+      "integrity": "sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==",
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5",
+        "es-abstract": "^1.18.0-next.1",
         "has": "^1.0.3"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0-next.1",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+          "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-negative-zero": "^2.0.0",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "object.fromentries": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.2.tgz",
-      "integrity": "sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==",
-      "dev": true,
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.3.tgz",
+      "integrity": "sha512-IDUSMXs6LOSJBWE++L0lzIbSqHl9KDCfff2x/JSEIDtEUavUnyMYC2ZGay/04Zq4UT8lvd4xNhU4/YHKibAOlw==",
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
+        "es-abstract": "^1.18.0-next.1",
         "has": "^1.0.3"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0-next.1",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+          "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-negative-zero": "^2.0.0",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "object.getownpropertydescriptors": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
-      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz",
+      "integrity": "sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0-next.1",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+          "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-negative-zero": "^2.0.0",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "object.map": {
@@ -15273,14 +19674,6 @@
       "requires": {
         "for-own": "^0.1.4",
         "is-extendable": "^0.1.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        }
       }
     },
     "object.pick": {
@@ -15290,18 +19683,46 @@
       "dev": true,
       "requires": {
         "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
       }
     },
     "object.values": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
-      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
-      "dev": true,
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.2.tgz",
+      "integrity": "sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==",
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
+        "es-abstract": "^1.18.0-next.1",
         "has": "^1.0.3"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0-next.1",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+          "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-negative-zero": "^2.0.0",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "on-finished": {
@@ -15340,9 +19761,9 @@
       "dev": true
     },
     "opener": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz",
-      "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
       "dev": true
     },
     "openurl": {
@@ -15543,11 +19964,15 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
     },
+    "paginator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/paginator/-/paginator-1.0.0.tgz",
+      "integrity": "sha1-dWVwKvmrlhbcph/CLHDroqQ1cmU="
+    },
     "pako": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-      "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
-      "dev": true
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
     },
     "parallel-transform": {
       "version": "1.2.0",
@@ -15558,6 +19983,23 @@
         "cyclist": "^1.0.1",
         "inherits": "^2.0.3",
         "readable-stream": "^2.1.5"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
       }
     },
     "param-case": {
@@ -15569,6 +20011,14 @@
         "sentence-case": "^1.1.2"
       }
     },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
     "parse-filepath": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
@@ -15603,8 +20053,7 @@
     "parse-node-version": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-      "dev": true
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA=="
     },
     "parse-passwd": {
       "version": "1.0.0",
@@ -15613,12 +20062,18 @@
       "dev": true
     },
     "parse5": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
-      "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
+    },
+    "parse5-htmlparser2-tree-adapter": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
+      "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
       "dev": true,
       "requires": {
-        "@types/node": "*"
+        "parse5": "^6.0.1"
       }
     },
     "parsejson": {
@@ -15631,22 +20086,16 @@
       }
     },
     "parseqs": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
-      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
-      "dev": true,
-      "requires": {
-        "better-assert": "~1.0.0"
-      }
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz",
+      "integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==",
+      "dev": true
     },
     "parseuri": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
-      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
-      "dev": true,
-      "requires": {
-        "better-assert": "~1.0.0"
-      }
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz",
+      "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==",
+      "dev": true
     },
     "parseurl": {
       "version": "1.3.3",
@@ -15805,6 +20254,15 @@
         "find-up": "^1.0.0"
       }
     },
+    "pkg-up": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-1.0.0.tgz",
+      "integrity": "sha1-Pgj7RhUlxEIWJKM7n35tCvWwWiY=",
+      "dev": true,
+      "requires": {
+        "find-up": "^1.0.0"
+      }
+    },
     "pkginfo": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz",
@@ -15815,11 +20273,20 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
       "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+      "dev": true,
       "requires": {
         "ansi-colors": "^1.0.1",
         "arr-diff": "^4.0.0",
         "arr-union": "^3.1.0",
         "extend-shallow": "^3.0.2"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        }
       }
     },
     "plur": {
@@ -15856,6 +20323,14 @@
       "requires": {
         "async": "1.5.2",
         "is-number-like": "^1.0.3"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        }
       }
     },
     "posix-character-classes": {
@@ -15876,33 +20351,6 @@
         "supports-color": "^3.2.3"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
         "has-flag": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
@@ -15915,15 +20363,6 @@
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
           "dev": true
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
         "supports-color": {
           "version": "3.2.3",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
@@ -16115,6 +20554,26 @@
         "postcss": "^6.0.1"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
         "postcss": {
           "version": "6.0.23",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
@@ -16131,6 +20590,15 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
@@ -16144,6 +20612,26 @@
         "postcss": "^6.0.1"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
         "css-selector-tokenizer": {
           "version": "0.7.3",
           "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz",
@@ -16176,6 +20664,15 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
@@ -16189,6 +20686,26 @@
         "postcss": "^6.0.1"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
         "css-selector-tokenizer": {
           "version": "0.7.3",
           "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz",
@@ -16221,6 +20738,15 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
@@ -16234,6 +20760,26 @@
         "postcss": "^6.0.1"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
         "postcss": {
           "version": "6.0.23",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
@@ -16250,6 +20796,15 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
@@ -16383,6 +20938,16 @@
       "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
       "dev": true
     },
+    "pretty-error": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz",
+      "integrity": "sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.20",
+        "renderkid": "^2.0.4"
+      }
+    },
     "pretty-format": {
       "version": "23.6.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz",
@@ -16398,6 +20963,15 @@
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
           "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
         }
       }
     },
@@ -16416,8 +20990,7 @@
     "process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
     },
     "process-nextick-args": {
       "version": "2.0.1",
@@ -16450,6 +21023,14 @@
       "integrity": "sha512-FuEc12/eKqqoRYIGBrUptCBRhobL19PS2U31vMNTfyck1FxPyMfgsXyW4Mav85y/ZN1hop3hOwRlUDok23oYfQ==",
       "dev": true
     },
+    "promish": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/promish/-/promish-5.1.1.tgz",
+      "integrity": "sha512-37xEzvSas6JIYI/BcKh5TwhaqWepI44u/hC+tQStkX1sxMf+L756beESPgSWirxRCPqtXHzosoNzpjLnTnP8FA==",
+      "requires": {
+        "es6-promise": "^3.0.2"
+      }
+    },
     "prompt": {
       "version": "0.2.14",
       "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz",
@@ -16487,7 +21068,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/prop-types-exact/-/prop-types-exact-1.2.0.tgz",
       "integrity": "sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==",
-      "dev": true,
       "requires": {
         "has": "^1.0.3",
         "object.assign": "^4.1.0",
@@ -16724,9 +21304,9 @@
       }
     },
     "react": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.13.1.tgz",
-      "integrity": "sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==",
+      "version": "16.14.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
+      "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
       "requires": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
@@ -16760,22 +21340,104 @@
       }
     },
     "react-bootstrap": {
-      "version": "0.31.5",
-      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-0.31.5.tgz",
-      "integrity": "sha512-xgDihgX4QvYHmHzL87faDBMDnGfYyqcrqV0TEbWY+JizePOG1vfb8M3xJN+6MJ3kUYqDtQSZ7v/Q6Y5YDrkMdA==",
+      "version": "0.32.4",
+      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-0.32.4.tgz",
+      "integrity": "sha512-xj+JfaPOvnvr3ow0aHC7Y3HaBKZNR1mm361hVxVzVX3fcdJNIrfiodbQ0m9nLBpNxiKG6FTU2lq/SbTDYT2vew==",
       "requires": {
-        "babel-runtime": "^6.11.6",
+        "@babel/runtime-corejs2": "^7.0.0",
         "classnames": "^2.2.5",
         "dom-helpers": "^3.2.0",
-        "invariant": "^2.2.1",
-        "keycode": "^2.1.2",
-        "prop-types": "^15.5.10",
+        "invariant": "^2.2.4",
+        "keycode": "^2.2.0",
+        "prop-types": "^15.6.1",
         "prop-types-extra": "^1.0.1",
-        "react-overlays": "^0.7.4",
-        "uncontrollable": "^4.1.0",
+        "react-overlays": "^0.8.0",
+        "react-prop-types": "^0.4.0",
+        "react-transition-group": "^2.0.0",
+        "uncontrollable": "^5.0.0",
         "warning": "^3.0.0"
       }
     },
+    "react-bootstrap-slider": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/react-bootstrap-slider/-/react-bootstrap-slider-2.2.3.tgz",
+      "integrity": "sha512-HsBhP9ZPktLD7ZtbmsAkx/oDzK5HLxSTQ3aSaX45RxdVh6P9kJ4nEwtIhBbcnLdq/Og3vOkQsGQHIOKsDUWq/w==",
+      "requires": {
+        "bootstrap-slider": "^10.6.1"
+      }
+    },
+    "react-bootstrap-table-next": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/react-bootstrap-table-next/-/react-bootstrap-table-next-4.0.3.tgz",
+      "integrity": "sha512-uKxC73qUdUfusRf2uzDfMiF9LvTG5vuhTZa0lbAgHWSLLLaKTsI0iHf1e4+c7gP71q8dFsp7StvkP65SxC1JRg==",
+      "requires": {
+        "classnames": "^2.2.5",
+        "react-transition-group": "^4.2.0",
+        "underscore": "1.9.1"
+      },
+      "dependencies": {
+        "dom-helpers": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.0.tgz",
+          "integrity": "sha512-Ru5o9+V8CpunKnz5LGgWXkmrH/20cGKwcHwS4m73zIvs54CN9epEmT/HLqFJW3kXpakAFkEdzgy1hzlJe3E4OQ==",
+          "requires": {
+            "@babel/runtime": "^7.8.7",
+            "csstype": "^3.0.2"
+          }
+        },
+        "react-transition-group": {
+          "version": "4.4.1",
+          "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz",
+          "integrity": "sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==",
+          "requires": {
+            "@babel/runtime": "^7.5.5",
+            "dom-helpers": "^5.0.1",
+            "loose-envify": "^1.4.0",
+            "prop-types": "^15.6.2"
+          }
+        }
+      }
+    },
+    "react-bootstrap-table2-filter": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/react-bootstrap-table2-filter/-/react-bootstrap-table2-filter-1.3.3.tgz",
+      "integrity": "sha512-lE+CHHGewzN9PCPaRqbu9wia8NMfwOBMPOAoAyfxbbMrZzjCf1WYRrHbWGzUj1MQlF5kJxLMwRgy/C604OmgMw=="
+    },
+    "react-bootstrap-table2-overlay": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/react-bootstrap-table2-overlay/-/react-bootstrap-table2-overlay-2.0.0.tgz",
+      "integrity": "sha512-sopZ5gJx+FhZh6agfOhcvEbIIeVz70hOghha4mtMktnH9IYrpOPvqSmxilt0nqijLlT5/il4fYt22VpEwvjtTw==",
+      "requires": {
+        "react-loading-overlay": "1.0.1"
+      }
+    },
+    "react-bootstrap-typeahead": {
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/react-bootstrap-typeahead/-/react-bootstrap-typeahead-3.4.7.tgz",
+      "integrity": "sha512-eUm3hqX12p+iM+1Y0HKF891/ACbKyGep7PsC2pjFGZL48r25Jlv3X2xmV5D8N0wE/YPFZF7iW913tyAlwqjw1Q==",
+      "requires": {
+        "classnames": "^2.2.0",
+        "create-react-context": "^0.3.0",
+        "escape-string-regexp": "^1.0.5",
+        "invariant": "^2.2.1",
+        "lodash": "^4.17.2",
+        "prop-types": "^15.5.8",
+        "prop-types-extra": "^1.0.1",
+        "react-overlays": "^0.8.1",
+        "react-popper": "^1.0.0",
+        "warning": "^4.0.1"
+      },
+      "dependencies": {
+        "warning": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+          "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+          "requires": {
+            "loose-envify": "^1.0.0"
+          }
+        }
+      }
+    },
     "react-datepicker": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-1.8.0.tgz",
@@ -16790,13 +21452,12 @@
     "react-deep-force-update": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/react-deep-force-update/-/react-deep-force-update-2.1.3.tgz",
-      "integrity": "sha512-lqD4eHKVuB65RyO/hGbEST53E2/GPbcIPcFYyeW/p4vNngtH4G7jnKGlU6u1OqrFo0uNfIvwuBOg98IbLHlNEA==",
-      "dev": true
+      "integrity": "sha512-lqD4eHKVuB65RyO/hGbEST53E2/GPbcIPcFYyeW/p4vNngtH4G7jnKGlU6u1OqrFo0uNfIvwuBOg98IbLHlNEA=="
     },
     "react-dom": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz",
-      "integrity": "sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==",
+      "version": "16.14.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",
+      "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==",
       "requires": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
@@ -16819,6 +21480,99 @@
       "requires": {
         "babel-plugin-emotion": "^8.0.12",
         "emotion-utils": "^8.0.12"
+      },
+      "dependencies": {
+        "@babel/helper-module-imports": {
+          "version": "7.0.0-beta.32",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.32.tgz",
+          "integrity": "sha512-9jxfqCBrwCIa0p5ZIy1sakzKKm8x8tn0C52qpPr0M0WJ/k9gpD4ilS/mTV2v0tgmw4agjYdUXQ8slq51/5oOzQ==",
+          "requires": {
+            "@babel/types": "7.0.0-beta.32",
+            "lodash": "^4.2.0"
+          }
+        },
+        "@babel/types": {
+          "version": "7.0.0-beta.32",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.32.tgz",
+          "integrity": "sha512-w8+wzVcYCMb9OfaBfay2Vg5hyj7UfBX6qQtA+kB0qsW1h1NH/7xHMwvTZNqkuFBwjz5wxGS2QmaIcC3HH+UoxA==",
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.2.0",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "babel-plugin-emotion": {
+          "version": "8.0.12",
+          "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-8.0.12.tgz",
+          "integrity": "sha512-GVxl6Y86I2PPICtFqabf5qvcVc0MD8PJbLujJ9UV1tdC5QoKMe+dZD0DCpdTDEzlOJVwetMu7m+bg66NeGi49w==",
+          "requires": {
+            "@babel/helper-module-imports": "7.0.0-beta.32",
+            "babel-macros": "^1.2.0",
+            "babel-plugin-syntax-jsx": "^6.18.0",
+            "convert-source-map": "^1.5.0",
+            "emotion-utils": "^8.0.12",
+            "find-root": "^1.1.0",
+            "source-map": "^0.5.7",
+            "touch": "^1.0.0"
+          }
+        },
+        "nopt": {
+          "version": "1.0.10",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
+          "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
+          "requires": {
+            "abbrev": "1"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "touch": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz",
+          "integrity": "sha1-RJy+LbrlqMgDjjDXH6D/RklHxN4=",
+          "requires": {
+            "nopt": "~1.0.10"
+          }
+        }
+      }
+    },
+    "react-filterable-table": {
+      "version": "0.3.434",
+      "resolved": "https://registry.npmjs.org/react-filterable-table/-/react-filterable-table-0.3.434.tgz",
+      "integrity": "sha512-4Ue6KZkxMDVsMlEvxVTtQGhQoZkODSLaJW38174bZMPKZLaZ/8i/F2PrSyEpezGhA9KoRM8neqeUYcrVIUIUDA==",
+      "requires": {
+        "axios": "^0.15.3",
+        "npm": "^6.1.0",
+        "react-pager": "^1.3.2"
+      },
+      "dependencies": {
+        "axios": {
+          "version": "0.15.3",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.15.3.tgz",
+          "integrity": "sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=",
+          "requires": {
+            "follow-redirects": "1.0.0"
+          }
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "follow-redirects": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz",
+          "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
+          "requires": {
+            "debug": "^2.2.0"
+          }
+        }
       }
     },
     "react-fontawesome": {
@@ -16854,7 +21608,6 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-3.1.3.tgz",
       "integrity": "sha512-d7nZf78irxoGN5PY4zd6CSgZiroOhvIWzRast3qwTn4sSnBwlt08kV8WMQ9mitmxEdlCTwZt+5ClrRSjxWguMQ==",
-      "dev": true,
       "requires": {
         "global": "^4.3.0",
         "react-deep-force-update": "^2.1.1",
@@ -16866,8 +21619,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
@@ -16884,28 +21636,60 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
+    "react-js-pagination": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/react-js-pagination/-/react-js-pagination-3.0.3.tgz",
+      "integrity": "sha512-podyA6Rd0uxc8uQakXWXxnonoOPI6NnFOROXfc6qPKNYm44s+Bgpn0JkyflcfbHf/GFKahnL8JN8rxBHZiBskg==",
+      "requires": {
+        "classnames": "^2.2.5",
+        "fstream": "1.0.12",
+        "paginator": "^1.0.0",
+        "prop-types": "15.x.x - 16.x.x",
+        "react": "15.x.x - 16.x.x",
+        "tar": "2.2.2"
+      }
+    },
     "react-lifecycles-compat": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
       "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
     },
+    "react-loading-overlay": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/react-loading-overlay/-/react-loading-overlay-1.0.1.tgz",
+      "integrity": "sha512-aUjtZ8tNXBSx+MbD2SQs0boPbeTAGTh+I5U9nWjDzMasKlYr58RJpr57c8W7uApeLpOkAGbInExRi6GamNC2bA==",
+      "requires": {
+        "emotion": "^10.0.1",
+        "prop-types": "^15.6.2",
+        "react-transition-group": "^2.5.0"
+      }
+    },
     "react-onclickoutside": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.9.0.tgz",
-      "integrity": "sha512-8ltIY3bC7oGhj2nPAvWOGi+xGFybPNhJM0V1H8hY/whNcXgmDeaeoCMPPd8VatrpTsUWjb/vGzrmu6SrXVty3A=="
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.9.1.tgz",
+      "integrity": "sha512-fkeEZOym0eyf8pemEUFRI6rttdREwfYtNWpN9msWsYtwz0G+w1KeKODc466lKJtfMHn3u8gVmBnGPf2fQ9LxoQ=="
     },
     "react-overlays": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-0.7.4.tgz",
-      "integrity": "sha512-7vsooMx3siLAuEfTs8FYeP/lAORWWFXTO8PON3KgX0Htq1Oa+po6ioSjGyO0/GO5CVSMNhpWt6V2opeexHgBuQ==",
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-0.8.3.tgz",
+      "integrity": "sha512-h6GT3jgy90PgctleP39Yu3eK1v9vaJAW73GOA/UbN9dJ7aAN4BTZD6793eI1D5U+ukMk17qiqN/wl3diK1Z5LA==",
       "requires": {
         "classnames": "^2.2.5",
         "dom-helpers": "^3.2.1",
         "prop-types": "^15.5.10",
         "prop-types-extra": "^1.0.1",
+        "react-transition-group": "^2.2.0",
         "warning": "^3.0.0"
       }
     },
+    "react-pager": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/react-pager/-/react-pager-1.3.3.tgz",
+      "integrity": "sha512-d5QqLaqa7BXt9V4Usls5EqoQN+xycktetT/cAZhSyiE/DB8aMxTbzpqn/ezoJwAHl0Mp6L3bjrTenIynobIryQ==",
+      "requires": {
+        "prop-types": "^15.5.10"
+      }
+    },
     "react-popper": {
       "version": "1.3.7",
       "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.7.tgz",
@@ -16930,11 +21714,18 @@
         }
       }
     },
+    "react-prop-types": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/react-prop-types/-/react-prop-types-0.4.0.tgz",
+      "integrity": "sha1-+ZsL+0AGkpya8gUefBQUpcdbk9A=",
+      "requires": {
+        "warning": "^3.0.0"
+      }
+    },
     "react-proxy": {
       "version": "3.0.0-alpha.1",
       "resolved": "https://registry.npmjs.org/react-proxy/-/react-proxy-3.0.0-alpha.1.tgz",
       "integrity": "sha1-RABCa8+oDKpnJMd1VpUxUgn6Swc=",
-      "dev": true,
       "requires": {
         "lodash": "^4.6.1"
       }
@@ -16953,9 +21744,9 @@
       }
     },
     "react-resizable": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/react-resizable/-/react-resizable-1.10.1.tgz",
-      "integrity": "sha512-Jd/bKOKx6+19NwC4/aMLRu/J9/krfxlDnElP41Oc+oLiUWs/zwV1S9yBfBZRnqAwQb6vQ/HRSk3bsSWGSgVbpw==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/react-resizable/-/react-resizable-1.11.0.tgz",
+      "integrity": "sha512-VoGz2ddxUFvildS8r8/29UZJeyiM3QJnlmRZSuXm+FpTqq/eIrMPc796Y9XQLg291n2hFZJtIoP1xC3hSTw/jg==",
       "requires": {
         "prop-types": "15.x",
         "react-draggable": "^4.0.3"
@@ -17036,19 +21827,97 @@
       }
     },
     "react-select": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/react-select/-/react-select-1.3.0.tgz",
-      "integrity": "sha512-g/QAU1HZrzSfxkwMAo/wzi6/ezdWye302RGZevsATec07hI/iSxcpB1hejFIp7V63DJ8mwuign6KmB3VjdlinQ==",
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/react-select/-/react-select-2.4.4.tgz",
+      "integrity": "sha512-C4QPLgy9h42J/KkdrpVxNmkY6p4lb49fsrbDk/hRcZpX7JvZPNb6mGj+c5SzyEtBv1DmQ9oPH4NmhAFvCrg8Jw==",
       "requires": {
-        "classnames": "^2.2.4",
-        "prop-types": "^15.5.8",
-        "react-input-autosize": "^2.1.2"
+        "classnames": "^2.2.5",
+        "emotion": "^9.1.2",
+        "memoize-one": "^5.0.0",
+        "prop-types": "^15.6.0",
+        "raf": "^3.4.0",
+        "react-input-autosize": "^2.2.1",
+        "react-transition-group": "^2.2.1"
+      },
+      "dependencies": {
+        "@emotion/hash": {
+          "version": "0.6.6",
+          "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.6.6.tgz",
+          "integrity": "sha512-ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ=="
+        },
+        "@emotion/memoize": {
+          "version": "0.6.6",
+          "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.6.6.tgz",
+          "integrity": "sha512-h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ=="
+        },
+        "@emotion/stylis": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.7.1.tgz",
+          "integrity": "sha512-/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ=="
+        },
+        "@emotion/unitless": {
+          "version": "0.6.7",
+          "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.6.7.tgz",
+          "integrity": "sha512-Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg=="
+        },
+        "babel-plugin-emotion": {
+          "version": "9.2.11",
+          "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-9.2.11.tgz",
+          "integrity": "sha512-dgCImifnOPPSeXod2znAmgc64NhaaOjGEHROR/M+lmStb3841yK1sgaDYAYMnlvWNz8GnpwIPN0VmNpbWYZ+VQ==",
+          "requires": {
+            "@babel/helper-module-imports": "^7.0.0",
+            "@emotion/babel-utils": "^0.6.4",
+            "@emotion/hash": "^0.6.2",
+            "@emotion/memoize": "^0.6.1",
+            "@emotion/stylis": "^0.7.0",
+            "babel-plugin-macros": "^2.0.0",
+            "babel-plugin-syntax-jsx": "^6.18.0",
+            "convert-source-map": "^1.5.0",
+            "find-root": "^1.1.0",
+            "mkdirp": "^0.5.1",
+            "source-map": "^0.5.7",
+            "touch": "^2.0.1"
+          }
+        },
+        "create-emotion": {
+          "version": "9.2.12",
+          "resolved": "https://registry.npmjs.org/create-emotion/-/create-emotion-9.2.12.tgz",
+          "integrity": "sha512-P57uOF9NL2y98Xrbl2OuiDQUZ30GVmASsv5fbsjF4Hlraip2kyAvMm+2PoYUvFFw03Fhgtxk3RqZSm2/qHL9hA==",
+          "requires": {
+            "@emotion/hash": "^0.6.2",
+            "@emotion/memoize": "^0.6.1",
+            "@emotion/stylis": "^0.7.0",
+            "@emotion/unitless": "^0.6.2",
+            "csstype": "^2.5.2",
+            "stylis": "^3.5.0",
+            "stylis-rule-sheet": "^0.0.10"
+          }
+        },
+        "csstype": {
+          "version": "2.6.14",
+          "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.14.tgz",
+          "integrity": "sha512-2mSc+VEpGPblzAxyeR+vZhJKgYg0Og0nnRi7pmRXFYYxSfnOnW8A5wwQb4n4cE2nIOzqKOAzLCaEX6aBmNEv8A=="
+        },
+        "emotion": {
+          "version": "9.2.12",
+          "resolved": "https://registry.npmjs.org/emotion/-/emotion-9.2.12.tgz",
+          "integrity": "sha512-hcx7jppaI8VoXxIWEhxpDW7I+B4kq9RNzQLmsrF6LY8BGKqe2N+gFAQr0EfuFucFlPs2A9HM4+xNj4NeqEWIOQ==",
+          "requires": {
+            "babel-plugin-emotion": "^9.2.11",
+            "create-emotion": "^9.2.12"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        }
       }
     },
     "react-smooth": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-1.0.5.tgz",
-      "integrity": "sha512-eW057HT0lFgCKh8ilr0y2JaH2YbNcuEdFpxyg7Gf/qDKk9hqGMyXryZJ8iMGJEuKH0+wxS0ccSsBBB3W8yCn8w==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-1.0.6.tgz",
+      "integrity": "sha512-B2vL4trGpNSMSOzFiAul9kFAsxTukL9Wyy9EXtkQy3GJr6sZqW9e1nShdVOJ3hRYamPZ94O17r3Q0bjSw3UYtg==",
       "requires": {
         "lodash": "~4.17.4",
         "prop-types": "^15.6.0",
@@ -17066,6 +21935,79 @@
         "prop-types": "^15.5.10",
         "react-emotion": "^8.0.6",
         "recompose": "0.26.0"
+      },
+      "dependencies": {
+        "@babel/helper-module-imports": {
+          "version": "7.0.0-beta.32",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.32.tgz",
+          "integrity": "sha512-9jxfqCBrwCIa0p5ZIy1sakzKKm8x8tn0C52qpPr0M0WJ/k9gpD4ilS/mTV2v0tgmw4agjYdUXQ8slq51/5oOzQ==",
+          "requires": {
+            "@babel/types": "7.0.0-beta.32",
+            "lodash": "^4.2.0"
+          }
+        },
+        "@babel/types": {
+          "version": "7.0.0-beta.32",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.32.tgz",
+          "integrity": "sha512-w8+wzVcYCMb9OfaBfay2Vg5hyj7UfBX6qQtA+kB0qsW1h1NH/7xHMwvTZNqkuFBwjz5wxGS2QmaIcC3HH+UoxA==",
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.2.0",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "babel-plugin-emotion": {
+          "version": "8.0.12",
+          "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-8.0.12.tgz",
+          "integrity": "sha512-GVxl6Y86I2PPICtFqabf5qvcVc0MD8PJbLujJ9UV1tdC5QoKMe+dZD0DCpdTDEzlOJVwetMu7m+bg66NeGi49w==",
+          "requires": {
+            "@babel/helper-module-imports": "7.0.0-beta.32",
+            "babel-macros": "^1.2.0",
+            "babel-plugin-syntax-jsx": "^6.18.0",
+            "convert-source-map": "^1.5.0",
+            "emotion-utils": "^8.0.12",
+            "find-root": "^1.1.0",
+            "source-map": "^0.5.7",
+            "touch": "^1.0.0"
+          }
+        },
+        "emotion": {
+          "version": "8.0.12",
+          "resolved": "https://registry.npmjs.org/emotion/-/emotion-8.0.12.tgz",
+          "integrity": "sha512-WwPA6wrFo/Rwkcmn3ptO8Bpjob1lgRtBl4KJxagfQ+ExwnIryql3JNNwQX6TvJvlLxQm5ByrG71PZbKode1hpw==",
+          "requires": {
+            "babel-plugin-emotion": "^8.0.12",
+            "emotion-utils": "^8.0.12",
+            "stylis": "^3.3.2",
+            "stylis-rule-sheet": "^0.0.5"
+          }
+        },
+        "nopt": {
+          "version": "1.0.10",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
+          "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
+          "requires": {
+            "abbrev": "1"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "stylis-rule-sheet": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.5.tgz",
+          "integrity": "sha512-d1i8CktqcZI8oR239dRh/tZmWRxje/WR8rTAiXcN+oJehNhSD8OIYObP34qPdlOn37iu1ysBEm186WIRKpUU2w=="
+        },
+        "touch": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz",
+          "integrity": "sha1-RJy+LbrlqMgDjjDXH6D/RklHxN4=",
+          "requires": {
+            "nopt": "~1.0.10"
+          }
+        }
       }
     },
     "react-split-pane": {
@@ -17087,9 +22029,9 @@
       }
     },
     "react-test-renderer": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.13.1.tgz",
-      "integrity": "sha512-Sn2VRyOK2YJJldOqoh8Tn/lWQ+ZiKhyZTPtaO0Q6yNj+QDbmRkVFap6pZPy3YQk8DScRDfyqm/KxKYP9gCMRiQ==",
+      "version": "16.14.0",
+      "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.14.0.tgz",
+      "integrity": "sha512-L8yPjqPE5CZO6rKsKXRO/rVPiaCOy0tQQJbC+UjPNlobl5mad59lvPjwFsQHTvL03caVDIVr9x9/OSgDe6I5Eg==",
       "requires": {
         "object-assign": "^4.1.1",
         "prop-types": "^15.6.2",
@@ -17112,6 +22054,14 @@
         }
       }
     },
+    "react-toggle": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/react-toggle/-/react-toggle-4.1.1.tgz",
+      "integrity": "sha512-+wXlMcSpg8SmnIXauMaZiKpR+r2wp2gMUteroejp2UTSqGTVvZLN+m9EhMzFARBKEw7KpQOwzCyfzeHeAndQGw==",
+      "requires": {
+        "classnames": "^2.2.5"
+      }
+    },
     "react-transition-group": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
@@ -17152,17 +22102,13 @@
       }
     },
     "readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
       "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
       }
     },
     "readdirp": {
@@ -17176,6 +22122,12 @@
         "readable-stream": "^2.0.2"
       },
       "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -17406,12 +22358,6 @@
             "kind-of": "^6.0.2"
           }
         },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -17432,6 +22378,12 @@
             }
           }
         },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
         "kind-of": {
           "version": "6.0.3",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -17458,6 +22410,21 @@
             "snapdragon": "^0.8.1",
             "to-regex": "^3.0.2"
           }
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
         }
       }
     },
@@ -17593,7 +22560,6 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/redbox-react/-/redbox-react-1.6.0.tgz",
       "integrity": "sha512-mLjM5eYR41yOp5YKHpd3syFeGq6B4Wj5vZr64nbLvTZW5ZLff4LYk7VE4ITpVxkZpCY6OZuqh0HiP3A3uEaCpg==",
-      "dev": true,
       "requires": {
         "error-stack-parser": "^1.3.6",
         "object-assign": "^4.0.1",
@@ -17694,13 +22660,12 @@
     "reflect.ownkeys": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz",
-      "integrity": "sha1-dJrO7H8/34tj+SegSAnpDFwLNGA=",
-      "dev": true
+      "integrity": "sha1-dJrO7H8/34tj+SegSAnpDFwLNGA="
     },
     "regenerate": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
-      "integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
       "dev": true
     },
     "regenerator": {
@@ -17726,9 +22691,9 @@
       }
     },
     "regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+      "version": "0.13.7",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
     },
     "regenerator-transform": {
       "version": "0.10.1",
@@ -17836,6 +22801,113 @@
       "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
       "dev": true
     },
+    "renderkid": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.5.tgz",
+      "integrity": "sha512-ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ==",
+      "dev": true,
+      "requires": {
+        "css-select": "^2.0.2",
+        "dom-converter": "^0.2",
+        "htmlparser2": "^3.10.1",
+        "lodash": "^4.17.20",
+        "strip-ansi": "^3.0.0"
+      },
+      "dependencies": {
+        "css-select": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
+          "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
+          "dev": true,
+          "requires": {
+            "boolbase": "^1.0.0",
+            "css-what": "^3.2.1",
+            "domutils": "^1.7.0",
+            "nth-check": "^1.0.2"
+          }
+        },
+        "css-what": {
+          "version": "3.4.2",
+          "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
+          "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
+          "dev": true
+        },
+        "dom-serializer": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+          "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "^2.0.1",
+            "entities": "^2.0.0"
+          },
+          "dependencies": {
+            "domelementtype": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz",
+              "integrity": "sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==",
+              "dev": true
+            }
+          }
+        },
+        "domelementtype": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+          "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+          "dev": true
+        },
+        "domhandler": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+          "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "1"
+          }
+        },
+        "domutils": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+          "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+          "dev": true,
+          "requires": {
+            "dom-serializer": "0",
+            "domelementtype": "1"
+          }
+        },
+        "htmlparser2": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+          "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "^1.3.1",
+            "domhandler": "^2.3.0",
+            "domutils": "^1.5.1",
+            "entities": "^1.1.1",
+            "inherits": "^2.0.1",
+            "readable-stream": "^3.1.1"
+          },
+          "dependencies": {
+            "entities": {
+              "version": "1.1.2",
+              "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+              "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+              "dev": true
+            }
+          }
+        },
+        "nth-check": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+          "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+          "dev": true,
+          "requires": {
+            "boolbase": "~1.0.0"
+          }
+        }
+      }
+    },
     "repeat-element": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
@@ -17857,9 +22929,9 @@
       }
     },
     "replace-ext": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
-      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw=="
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ="
     },
     "replacestream": {
       "version": "4.0.3",
@@ -17870,6 +22942,23 @@
         "escape-string-regexp": "^1.0.3",
         "object-assign": "^4.0.1",
         "readable-stream": "^2.0.2"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
       }
     },
     "request": {
@@ -17934,6 +23023,12 @@
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
     },
+    "require-package-name": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/require-package-name/-/require-package-name-2.0.1.tgz",
+      "integrity": "sha1-wR6XJ2tluOKSP3Xav1+y7ww4Qbk=",
+      "dev": true
+    },
     "require-uncached": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
@@ -17942,6 +23037,14 @@
       "requires": {
         "caller-path": "^0.1.0",
         "resolve-from": "^1.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
+          "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
+          "dev": true
+        }
       }
     },
     "requires-port": {
@@ -17956,10 +23059,11 @@
       "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
     },
     "resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+      "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
       "requires": {
+        "is-core-module": "^2.1.0",
         "path-parse": "^1.0.6"
       }
     },
@@ -17991,10 +23095,9 @@
       }
     },
     "resolve-from": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
-      "dev": true
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
     },
     "resolve-pathname": {
       "version": "3.0.0",
@@ -18084,25 +23187,6 @@
         "source-map-support": "^0.3.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
         "source-map": {
           "version": "0.1.32",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
@@ -18120,21 +23204,6 @@
           "requires": {
             "source-map": "0.1.32"
           }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
         }
       }
     },
@@ -18262,6 +23331,12 @@
             "normalize-path": "^2.1.1"
           }
         },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -18492,12 +23567,6 @@
             "kind-of": "^6.0.2"
           }
         },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -18518,6 +23587,12 @@
             }
           }
         },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
         "kind-of": {
           "version": "6.0.3",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -18544,6 +23619,15 @@
             "snapdragon": "^0.8.1",
             "to-regex": "^3.0.2"
           }
+        },
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "dev": true,
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
         }
       }
     },
@@ -18569,6 +23653,12 @@
         "object-assign": "^4.0.1"
       },
       "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        },
         "big.js": {
           "version": "3.2.0",
           "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
@@ -18604,8 +23694,7 @@
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
     "scheduler": {
       "version": "0.19.1",
@@ -18616,6 +23705,41 @@
         "object-assign": "^4.1.1"
       }
     },
+    "schema-utils": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
+      "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
+      "dev": true,
+      "requires": {
+        "ajv": "^5.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+          "dev": true,
+          "requires": {
+            "co": "^4.6.0",
+            "fast-deep-equal": "^1.0.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.3.0"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+          "dev": true
+        }
+      }
+    },
     "scss-tokenizer": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
@@ -18793,6 +23917,11 @@
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
+    "set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E="
+    },
     "set-value": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
@@ -18813,12 +23942,6 @@
           "requires": {
             "is-extendable": "^0.1.0"
           }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
         }
       }
     },
@@ -18911,6 +24034,16 @@
         "lolex": "^4.2.0",
         "nise": "^1.5.2",
         "supports-color": "^5.5.0"
+      },
+      "dependencies": {
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "sisteransi": {
@@ -18983,12 +24116,6 @@
             "is-extendable": "^0.1.0"
           }
         },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -19046,6 +24173,12 @@
             "kind-of": "^6.0.2"
           }
         },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
         "kind-of": {
           "version": "6.0.3",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -19087,6 +24220,12 @@
         "socket.io-parser": "~3.2.0"
       },
       "dependencies": {
+        "base64-arraybuffer": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+          "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
+          "dev": true
+        },
         "component-emitter": {
           "version": "1.2.1",
           "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
@@ -19131,6 +24270,24 @@
           "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
           "dev": true
         },
+        "parseqs": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
+          "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
+          "dev": true,
+          "requires": {
+            "better-assert": "~1.0.0"
+          }
+        },
+        "parseuri": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
+          "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
+          "dev": true,
+          "requires": {
+            "better-assert": "~1.0.0"
+          }
+        },
         "socket.io-client": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
@@ -19184,67 +24341,35 @@
       "dev": true
     },
     "socket.io-client": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.0.tgz",
-      "integrity": "sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.4.0.tgz",
+      "integrity": "sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==",
       "dev": true,
       "requires": {
         "backo2": "1.0.2",
-        "base64-arraybuffer": "0.1.5",
         "component-bind": "1.0.0",
-        "component-emitter": "1.2.1",
-        "debug": "~4.1.0",
-        "engine.io-client": "~3.4.0",
+        "component-emitter": "~1.3.0",
+        "debug": "~3.1.0",
+        "engine.io-client": "~3.5.0",
         "has-binary2": "~1.0.2",
-        "has-cors": "1.1.0",
         "indexof": "0.0.1",
-        "object-component": "0.0.3",
-        "parseqs": "0.0.5",
-        "parseuri": "0.0.5",
+        "parseqs": "0.0.6",
+        "parseuri": "0.0.6",
         "socket.io-parser": "~3.3.0",
         "to-array": "0.1.4"
-      },
-      "dependencies": {
-        "component-emitter": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-          "dev": true
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "socket.io-parser": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.0.tgz",
-      "integrity": "sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz",
+      "integrity": "sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==",
       "dev": true,
       "requires": {
-        "component-emitter": "1.2.1",
+        "component-emitter": "~1.3.0",
         "debug": "~3.1.0",
         "isarray": "2.0.1"
       },
       "dependencies": {
-        "component-emitter": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-          "dev": true
-        },
         "isarray": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
@@ -19279,9 +24404,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
@@ -19294,9 +24419,9 @@
           "dev": true
         },
         "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
           "dev": true
         }
       }
@@ -19422,7 +24547,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/sourcemapped-stacktrace/-/sourcemapped-stacktrace-1.1.11.tgz",
       "integrity": "sha512-O0pcWjJqzQFVsisPlPXuNawJHHg9N9UgpJ/aDmvi9+vnS3x1C0NhwkVFzzZ1VN0Xo+bekyweoqYvBw5ZBKiNnQ==",
-      "dev": true,
       "requires": {
         "source-map": "0.5.6"
       },
@@ -19430,16 +24554,14 @@
         "source-map": {
           "version": "0.5.6",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
-          "dev": true
+          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
         }
       }
     },
     "sparkles": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
-      "dev": true
+      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw=="
     },
     "spdx-correct": {
       "version": "3.1.1",
@@ -19465,9 +24587,9 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz",
+      "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ=="
     },
     "split-string": {
       "version": "3.1.0",
@@ -19521,16 +24643,26 @@
       "dev": true
     },
     "stack-utils": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
-      "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==",
-      "dev": true
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.4.tgz",
+      "integrity": "sha512-IPDJfugEGbfizBwBZRZ3xpccMdRyP5lqsBWXGQWimVjua/ccLCeMOAVjlc1R7LxFjo5sEDhyNIXd8mo/AiDS9w==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "dependencies": {
+        "escape-string-regexp": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+          "dev": true
+        }
+      }
     },
     "stackframe": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz",
-      "integrity": "sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ=",
-      "dev": true
+      "integrity": "sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ="
     },
     "stat-mode": {
       "version": "0.2.2",
@@ -19571,6 +24703,22 @@
       "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
       "requires": {
         "readable-stream": "^2.0.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
       }
     },
     "stealthy-require": {
@@ -19587,6 +24735,23 @@
       "requires": {
         "inherits": "~2.0.1",
         "readable-stream": "^2.0.2"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
       }
     },
     "stream-cache": {
@@ -19622,6 +24787,23 @@
         "readable-stream": "^2.3.6",
         "to-arraybuffer": "^1.0.0",
         "xtend": "^4.0.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
       }
     },
     "stream-shift": {
@@ -19647,6 +24829,23 @@
       "dev": true,
       "requires": {
         "readable-stream": "^2.0.2"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
       }
     },
     "streamqueue": {
@@ -19690,6 +24889,17 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
+    "string-extended": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/string-extended/-/string-extended-0.0.8.tgz",
+      "integrity": "sha1-dBlX3/SHsCcqee7FpE8jnubxfM0=",
+      "requires": {
+        "array-extended": "~0.0.5",
+        "date-extended": "~0.0.3",
+        "extended": "~0.0.3",
+        "is-extended": "~0.0.3"
+      }
+    },
     "string-length": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz",
@@ -19697,17 +24907,6 @@
       "dev": true,
       "requires": {
         "strip-ansi": "^3.0.0"
-      },
-      "dependencies": {
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        }
       }
     },
     "string-width": {
@@ -19718,45 +24917,57 @@
         "code-point-at": "^1.0.0",
         "is-fullwidth-code-point": "^1.0.0",
         "strip-ansi": "^3.0.0"
-      },
-      "dependencies": {
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        }
       }
     },
     "string.prototype.trim": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz",
-      "integrity": "sha512-MjGFEeqixw47dAMFMtgUro/I0+wNqZB5GKXGt1fFr24u3TzDXCPu7J9Buppzoe3r/LqkSDLDDJzE15RGWDGAVw==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.3.tgz",
+      "integrity": "sha512-16IL9pIBA5asNOSukPfxX2W68BaBvxyiRK16H3RA/lWW9BDosh+w7f+LhomPHpXJ82QEe7w7/rY/S1CV97raLg==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1"
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0-next.1",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+          "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-negative-zero": "^2.0.0",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "string.prototype.trimend": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz",
+      "integrity": "sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==",
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz",
+      "integrity": "sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==",
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
       }
     },
     "string_decoder": {
@@ -19787,18 +24998,11 @@
       "optional": true
     },
     "strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "requires": {
-        "ansi-regex": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        }
+        "ansi-regex": "^2.0.0"
       }
     },
     "strip-bom": {
@@ -19827,6 +25031,21 @@
           "requires": {
             "readable-stream": "^2.0.2"
           }
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
         }
       }
     },
@@ -19865,17 +25084,14 @@
       "integrity": "sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q=="
     },
     "stylis-rule-sheet": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.5.tgz",
-      "integrity": "sha512-d1i8CktqcZI8oR239dRh/tZmWRxje/WR8rTAiXcN+oJehNhSD8OIYObP34qPdlOn37iu1ysBEm186WIRKpUU2w=="
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz",
+      "integrity": "sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw=="
     },
     "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
     },
     "supports-hyperlinks": {
       "version": "1.0.1",
@@ -19892,6 +25108,23 @@
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
           "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
           "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          },
+          "dependencies": {
+            "has-flag": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+              "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+              "dev": true
+            }
+          }
         }
       }
     },
@@ -20055,25 +25288,12 @@
             "json-stable-stringify": "^1.0.1"
           }
         },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
@@ -20088,46 +25308,23 @@
           "requires": {
             "is-fullwidth-code-point": "^2.0.0",
             "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
           }
         },
         "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "^3.0.0"
           }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
         }
       }
     },
     "tapable": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
-      "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
       "dev": true
     },
     "tar": {
@@ -20140,24 +25337,16 @@
         "inherits": "2"
       }
     },
-    "temp": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz",
-      "integrity": "sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==",
-      "dev": true,
+    "tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
       "requires": {
-        "rimraf": "~2.6.2"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
       }
     },
     "test-exclude": {
@@ -20194,49 +25383,13 @@
       "dev": true
     },
     "tfunk": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/tfunk/-/tfunk-3.1.0.tgz",
-      "integrity": "sha1-OORBT8ZJd9h6/apy+sttKfgve1s=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tfunk/-/tfunk-4.0.0.tgz",
+      "integrity": "sha512-eJQ0dGfDIzWNiFNYFVjJ+Ezl/GmwHaFTBTjrtqNPW0S7cuVDBrZrmzUz6VkMeCR4DZFqhd4YtLwsw3i2wYHswQ==",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.1",
-        "object-path": "^0.9.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
+        "chalk": "^1.1.3",
+        "dlv": "^1.1.3"
       }
     },
     "throat": {
@@ -20258,6 +25411,22 @@
       "requires": {
         "readable-stream": "~2.3.6",
         "xtend": "~4.0.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
       }
     },
     "tildify": {
@@ -20272,13 +25441,12 @@
     "time-stamp": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-      "dev": true
+      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM="
     },
     "timers-browserify": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
       "dev": true,
       "requires": {
         "setimmediate": "^1.0.4"
@@ -20311,12 +25479,11 @@
       "dev": true
     },
     "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz",
+      "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==",
       "requires": {
-        "os-tmpdir": "~1.0.2"
+        "rimraf": "^2.6.3"
       }
     },
     "tmpl": {
@@ -20342,12 +25509,6 @@
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
       "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
     },
-    "to-iso-string": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz",
-      "integrity": "sha1-TcGeZk38y+Jb2NtQiwDG2hWCVdE=",
-      "dev": true
-    },
     "to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
@@ -20433,10 +25594,16 @@
         }
       }
     },
+    "toposort": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
+      "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=",
+      "dev": true
+    },
     "touch": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz",
-      "integrity": "sha1-RJy+LbrlqMgDjjDXH6D/RklHxN4=",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/touch/-/touch-2.0.2.tgz",
+      "integrity": "sha512-qjNtvsFXTRq7IuMLweVgFxmEuQ6gLbRs2jQxL80TtZ31dEKWYIxRXquij6w6VimyDek5hD3PytljHmEtAs2u0A==",
       "requires": {
         "nopt": "~1.0.10"
       },
@@ -20535,6 +25702,11 @@
         }
       }
     },
+    "traverse": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+      "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk="
+    },
     "trim-newlines": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
@@ -20639,9 +25811,9 @@
       "dev": true
     },
     "ua-parser-js": {
-      "version": "0.7.21",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz",
-      "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ=="
+      "version": "0.7.23",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.23.tgz",
+      "integrity": "sha512-m4hvMLxgGHXG3O3fQVAyyAQpZzDOvwnhOTjYz5Xmr7r/+LpkNy3vJXdVRWgd1TkAb7NGROZuSy96CrlNVjA7KA=="
     },
     "uglify-js": {
       "version": "2.6.4",
@@ -20729,18 +25901,17 @@
       "dev": true
     },
     "uncontrollable": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-4.1.0.tgz",
-      "integrity": "sha1-4DWCkSUuGGUiLZCTmxny9J+Bwak=",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-5.1.0.tgz",
+      "integrity": "sha512-5FXYaFANKaafg4IVZXUNtGyzsnYEvqlr9wQ3WpZxFpEUxl29A3H6Q4G1Dnnorvq9TGOGATBApWR4YpLAh+F5hw==",
       "requires": {
-        "invariant": "^2.1.0"
+        "invariant": "^2.2.4"
       }
     },
     "underscore": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
-      "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
-      "dev": true
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
+      "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
     },
     "union-value": {
       "version": "1.0.1",
@@ -20752,14 +25923,6 @@
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
         "set-value": "^2.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        }
       }
     },
     "uniq": {
@@ -20847,6 +26010,44 @@
           "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
           "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
           "dev": true
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
+    },
+    "unzipper": {
+      "version": "0.9.15",
+      "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.9.15.tgz",
+      "integrity": "sha512-2aaUvO4RAeHDvOCuEtth7jrHFaCKTSXPqUkXwADaLBzGbgZGzUDccoEdJ5lW+3RmfpOZYNx0Rw6F6PUzM6caIA==",
+      "requires": {
+        "big-integer": "^1.6.17",
+        "binary": "~0.3.0",
+        "bluebird": "~3.4.1",
+        "buffer-indexof-polyfill": "~1.0.0",
+        "duplexer2": "~0.1.4",
+        "fstream": "^1.0.12",
+        "listenercount": "~1.0.1",
+        "readable-stream": "~2.3.6",
+        "setimmediate": "~1.0.4"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
         }
       }
     },
@@ -20866,9 +26067,9 @@
       }
     },
     "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -20939,6 +26140,17 @@
       "requires": {
         "lru-cache": "4.1.x",
         "tmp": "0.0.x"
+      },
+      "dependencies": {
+        "tmp": {
+          "version": "0.0.33",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+          "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+          "dev": true,
+          "requires": {
+            "os-tmpdir": "~1.0.2"
+          }
+        }
       }
     },
     "util": {
@@ -20964,17 +26176,21 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
+      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
+        "define-properties": "^1.1.2",
+        "object.getownpropertydescriptors": "^2.0.3"
       }
     },
+    "utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
+      "dev": true
+    },
     "utile": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
@@ -21099,19 +26315,10 @@
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
       "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-      "dev": true,
       "requires": {
         "clone": "^1.0.0",
         "clone-stats": "^0.0.1",
         "replace-ext": "0.0.1"
-      },
-      "dependencies": {
-        "replace-ext": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-          "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-          "dev": true
-        }
       }
     },
     "vinyl-file": {
@@ -21128,12 +26335,6 @@
         "vinyl": "^1.1.0"
       },
       "dependencies": {
-        "replace-ext": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-          "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-          "dev": true
-        },
         "vinyl": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
@@ -21363,6 +26564,12 @@
           "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
           "dev": true
         },
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        },
         "big.js": {
           "version": "3.2.0",
           "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
@@ -21437,6 +26644,12 @@
             "has-flag": "^1.0.0"
           }
         },
+        "tapable": {
+          "version": "0.1.10",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+          "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
+          "dev": true
+        },
         "uglify-js": {
           "version": "2.7.5",
           "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
@@ -21478,9 +26691,9 @@
       }
     },
     "webpack-bundle-analyzer": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.8.0.tgz",
-      "integrity": "sha512-PODQhAYVEourCcOuU+NiYI7WdR8QyELZGgPvB1y2tjbUpbmcQOt5Q7jEK+ttd5se0KSBKD9SXHCEozS++Wllmw==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz",
+      "integrity": "sha512-Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA==",
       "dev": true,
       "requires": {
         "acorn": "^7.1.1",
@@ -21492,16 +26705,16 @@
         "express": "^4.16.3",
         "filesize": "^3.6.1",
         "gzip-size": "^5.0.0",
-        "lodash": "^4.17.15",
+        "lodash": "^4.17.19",
         "mkdirp": "^0.5.1",
         "opener": "^1.5.1",
         "ws": "^6.0.0"
       },
       "dependencies": {
         "acorn": {
-          "version": "7.4.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz",
-          "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==",
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
           "dev": true
         },
         "acorn-walk": {
@@ -21509,6 +26722,44 @@
           "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
           "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
           "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "ws": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+          "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+          "dev": true,
+          "requires": {
+            "async-limiter": "~1.0.0"
+          }
         }
       }
     },
@@ -21551,6 +26802,21 @@
           "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
           "dev": true
         },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
         "time-stamp": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-2.2.0.tgz",
@@ -21613,15 +26879,6 @@
             "is-extglob": "^2.1.0"
           }
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
         "supports-color": {
           "version": "3.2.3",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
@@ -21633,6 +26890,11 @@
         }
       }
     },
+    "webpack-node-externals": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.7.2.tgz",
+      "integrity": "sha512-ajerHZ+BJKeCLviLUUmnyd5B4RavLF76uv3cs6KNuO8W+HuQaEs0y0L7o40NQxdPy5w0pcv8Ew7yPUAQG0UdCg=="
+    },
     "websocket-driver": {
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
@@ -21660,9 +26922,9 @@
       }
     },
     "whatwg-fetch": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.4.0.tgz",
-      "integrity": "sha512-rsum2ulz2iuZH08mJkT0Yi6JnKhwdw4oeyMjokgxd+mmqYSd9cPpOQf01TIWgjxG/U4+QR+AwKq6lSbXVxkyoQ=="
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz",
+      "integrity": "sha512-jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A=="
     },
     "whatwg-mimetype": {
       "version": "2.3.0",
@@ -21702,16 +26964,16 @@
       }
     },
     "which-boxed-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.1.tgz",
-      "integrity": "sha512-7BT4TwISdDGBgaemWU0N0OU7FeAEJ9Oo2P1PHRm/FCWoEi2VLWC9b6xvxAA3C/NMpxg3HXVgi0sMmGbNUbNepQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
       "dev": true,
       "requires": {
-        "is-bigint": "^1.0.0",
-        "is-boolean-object": "^1.0.0",
-        "is-number-object": "^1.0.3",
-        "is-string": "^1.0.4",
-        "is-symbol": "^1.0.2"
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
       }
     },
     "which-collection": {
@@ -21807,6 +27069,14 @@
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
         },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
@@ -21858,13 +27128,10 @@
       }
     },
     "ws": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz",
-      "integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==",
-      "dev": true,
-      "requires": {
-        "async-limiter": "~1.0.0"
-      }
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz",
+      "integrity": "sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==",
+      "dev": true
     },
     "wtf-8": {
       "version": "1.0.0",
@@ -21878,12 +27145,35 @@
       "integrity": "sha1-ZGV4SKIP/F31g6Qq2KJ3tFErvE0=",
       "dev": true
     },
+    "xml-loader": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/xml-loader/-/xml-loader-1.2.1.tgz",
+      "integrity": "sha1-A0hNpxDETTYQ3TbCr0CUs1tPeXU=",
+      "requires": {
+        "loader-utils": "^1.0.0",
+        "xml2js": "^0.4.16"
+      }
+    },
     "xml-name-validator": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
       "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
       "dev": true
     },
+    "xml2js": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "requires": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      }
+    },
+    "xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
+    },
     "xmlhttprequest": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
@@ -21901,15 +27191,20 @@
       "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
     },
     "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
+      "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ=="
     },
     "yallist": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
       "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
     },
+    "yaml": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz",
+      "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg=="
+    },
     "yargs": {
       "version": "13.3.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
@@ -21995,6 +27290,16 @@
       "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
       "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
       "dev": true
+    },
+    "zip-stream": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-2.1.3.tgz",
+      "integrity": "sha512-EkXc2JGcKhO5N5aZ7TmuNo45budRaFGHOmz24wtJR7znbNqDPmdZtUauKX6et8KAVseAMBOyWJqEpXcHTBsh7Q==",
+      "requires": {
+        "archiver-utils": "^2.1.0",
+        "compress-commons": "^2.1.1",
+        "readable-stream": "^3.4.0"
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index 8038797..0eabba8 100644
--- a/package.json
+++ b/package.json
@@ -14,36 +14,53 @@
   "dependencies": {
     "axios": "^0.18.0",
     "collapsible-sliding-panel": "1.0.2",
+    "bootstrap": "^4.1.3",
+    "bootstrap-switch-button-react": "^1.2.0",
+    "classnames": "^2.2.6",
     "core-js": "^2.4.0",
     "crypto-js": "^3.1.9-1",
     "d3": "^4.12.0",
+    "d3-selection-multi": "^1.0.1",
+    "enzyme-adapter-react-16": "^1.7.0",
     "es6-promise": "^3.2.1",
+    "exceljs": "^1.6.3",
     "filter-bar-utils": "1.0.3",
-    "gulp-sass": "^4.1.0",
+    "gulp-sass": "^3.0.0",
+    "fs": "0.0.1-security",
     "jquery": "^2.2.2",
     "loadable-components": "^2.2.2",
-    "lodash": "^4.17.4",
+    "lodash": "^4.17.11",
     "lodash.debounce": "^4.0.8",
     "md5": "^2.1.0",
     "moment": "^2.13.0",
     "moment-timezone": "^0.5.5",
     "node-fetch": "^1.5.3",
+    "node-sass": "^4.7.2",
     "prop-types": "^15.6.2",
     "react": "^16.4.1",
-    "react-autosuggest": "^9.3.4",
+    "react-autosuggest": "^9.4.2",
     "react-autowhatever": "^10.1.2",
-    "react-bootstrap": "^0.31.2",
+    "react-bootstrap": "^0.32.4",
     "react-datepicker": "^1.7.0",
     "react-dom": "^16.4.2",
+    "react-bootstrap-slider": "^2.2.2",
+    "react-bootstrap-table-next": "^4.0.3",
+    "react-bootstrap-table2-filter": "^1.3.3",
+    "react-bootstrap-table2-overlay": "^2.0.0",
+    "react-bootstrap-typeahead": "^3.2.3",
+    "react-filterable-table": "^0.3.434",
     "react-fontawesome": "^1.6.1",
     "react-grid-layout": "^0.14.4",
     "react-highlight-words": "^0.11.0",
+    "react-hot-loader": "^3.0.0-beta.6",
+    "react-js-pagination": "^3.0.2",
     "react-redux": "^4.4.1",
-    "react-router-dom": "^4.1.1",
-    "react-select": "^1.2.1",
+    "react-router-dom": "^4.2.2",
+    "react-select": "^2.1.0",
     "react-spinners": "^0.2.5",
-    "react-split-pane": "^0.1.51",
-    "react-test-renderer": "^16.4.1",
+    "react-split-pane": "^0.1.84",
+    "react-test-renderer": "^16.6.3",
+    "react-toggle": "^4.1.1",
     "recharts": "^1.1.0",
     "redux": "^3.3.1",
     "redux-form": "^6.2.1",
@@ -52,36 +69,40 @@
     "topojson": "^2.2.0",
     "uuid-js": "^0.7.5",
     "validator": "^4.3.0",
+    "webpack-node-externals": "^1.7.2",
+    "xml-loader": "^1.2.1",
+    "xmlhttprequest": "^1.8.0",
     "velocity-react": "^1.4.1",
     "vertical-filter-bar": "1.0.12"
   },
   "devDependencies": {
     "babel-core": "^6.25.0",
     "babel-eslint": "^6.0.4",
-    "babel-jest": "^22.4.1",
-    "babel-loader": "^6.2.4",
+    "babel-jest": "^23.6.0",
+    "babel-loader": "^6.4.1",
     "babel-preset-es2015": "^6.9.0",
     "babel-preset-react": "^6.5.0",
     "babel-preset-stage-0": "^6.5.0",
     "copy-webpack-plugin": "^4.0.1",
     "crypto-js": "^3.1.9-1",
-    "css-loader": "^0.23.1",
-    "enzyme": "^3.3.0",
+    "css-loader": "^0.25.0",
+    "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.1.1",
     "enzyme-react-16-adapter-setup": "^0.1.0",
     "eslint": "^3.1.1",
     "eslint-loader": "^1.3.0",
-    "eslint-plugin-import": "^0.8.1",
-    "eslint-plugin-react": "^3.14.0",
+    "eslint-plugin-import": "^1.8.0",
+    "eslint-plugin-react": "^5.1.1",
     "expect": "^1.20.1",
     "express": "^4.13.3",
     "fetch-mock": "^5.13.1",
-    "file-loader": "^0.8.5",
+    "file-loader": "1.1.6",
+    "fs": "0.0.1-security",
     "gulp": "^3.9.1",
     "gulp-clean": "^0.3.1",
     "gulp-css-usage": "^2.0.0",
-    "gulp-helpers": "^5.1.0",
-    "gulp-jsx-coverage": "^0.3.8",
+    "gulp-helpers": "^5.0.0",
+    "gulp-jsx-coverage": "^0.4.0",
     "gulp-rename": "^1.2.2",
     "gulp-replace": "^0.5.4",
     "http-proxy-middleware": "^0.8.2",
@@ -89,17 +110,16 @@
     "isparta-loader": "^2.0.0",
     "istanbul": "^1.0.0-alpha.2",
     "istanbul-instrumenter-loader": "^0.2.0",
-    "jest": "^23.0.1",
+    "jest": "^23.6.0",
     "jest-enzyme": "^6.0.0",
     "jest-fetch-mock": "^1.5.0",
-    "json-loader": "^0.5.4",
+    "json-loader": "^0.5.7",
     "jsx-loader": "^0.13.2",
     "nock": "^8.0.0",
-    "node-sass": "^4.14.1",
+    "node-sass": "^4.8.3",
     "node-watch": "^0.3.5",
     "prompt": "^0.2.14",
-    "randomstring": "^1.1.5",
-    "react-addons-test-utils": "^15.1.0",
+    "react-addons-test-utils": "^15.3.2",
     "react-hot-loader": "^3.0.0-beta.6",
     "redux-mock-store": "^1.5.3",
     "sass-loader": "^3.1.2",
@@ -108,7 +128,23 @@
     "url-loader": "^0.5.7",
     "webpack": "^1.13.1",
     "webpack-bundle-analyzer": "^3.0.3",
-    "webpack-dev-server": "^1.14.1"
+    "webpack-dev-server": "^1.14.1",
+    "randomstring": "^1.1.5",
+    "babel-plugin-lodash": "^3.1.4",
+    "babel-polyfill": "^6.5.0",
+    "chai": "^3.5.0",
+    "chai-immutable": "^1.6.0",
+    "clean-webpack-plugin": "^0.1.19",
+    "gulp-concat": "^2.6.1",
+    "html-webpack-plugin": "^3.1.0",
+    "immutable": "^3.8.1",
+    "mocha": "^3.1.2",
+    "process": "^0.11.10",
+    "react-bootstrap": "^0.32.4",
+    "react-dom": "^16.4.1",
+    "react-fontawesome": "^0.3.3",
+    "xml-loader": "^1.2.1",
+    "xmlhttprequest": "^1.8.0"
   },
   "jest": {
     "verbose": true,
@@ -116,8 +152,7 @@
     "automock": false,
     "moduleNameMapper": {
       "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/test/fileMock.js",
-      "\\.(css|scss)$": "<rootDir>/test/styleMock.js",
-      "resources/(.*)": "<rootDir>/resources/$1"
+      "\\.(css|scss)$": "<rootDir>/test/styleMock.js"
     },
     "testURL": "http://localhost",
     "moduleFileExtensions": [
@@ -142,10 +177,7 @@
       "!**/webpack.config.js",
       "!**/webpack.devConfig.js",
       "!**/coverage/**",
-      "!**/tools/**",
-      "!src/app/main.app.jsx",
-      "!src/app/configurableViews/index.js",
-      "!src/app/extensibility/index.js"
+      "!**/tools/**"
     ]
   },
   "engines": {
diff --git a/resources/css/bootstrap-slider.css b/resources/css/bootstrap-slider.css
new file mode 100644
index 0000000..3ea9908
--- /dev/null
+++ b/resources/css/bootstrap-slider.css
@@ -0,0 +1,328 @@
+/*! =======================================================
+                      VERSION  10.6.1
+========================================================= */
+/*! =========================================================
+ * bootstrap-slider.js
+ *
+ * Maintainers:
+ *		Kyle Kemp
+ *			- Twitter: @seiyria
+ *			- Github:  seiyria
+ *		Rohit Kalkur
+ *			- Twitter: @Rovolutionary
+ *			- Github:  rovolution
+ *
+ * =========================================================
+  *
+ * bootstrap-slider is released under the MIT License
+ * Copyright (c) 2019 Kyle Kemp, Rohit Kalkur, and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * ========================================================= */
+.slider {
+  display: inline-block;
+  vertical-align: middle;
+  position: relative;
+}
+.slider.slider-horizontal {
+  width: 210px;
+  height: 20px;
+}
+.slider.slider-horizontal .slider-track {
+  height: 10px;
+  width: 100%;
+  margin-top: -5px;
+  top: 50%;
+  left: 0;
+}
+.slider.slider-horizontal .slider-selection,
+.slider.slider-horizontal .slider-track-low,
+.slider.slider-horizontal .slider-track-high {
+  height: 100%;
+  top: 0;
+  bottom: 0;
+}
+.slider.slider-horizontal .slider-tick,
+.slider.slider-horizontal .slider-handle {
+  margin-left: -10px;
+}
+.slider.slider-horizontal .slider-tick.triangle,
+.slider.slider-horizontal .slider-handle.triangle {
+  position: relative;
+  top: 50%;
+  -ms-transform: translateY(-50%);
+  transform: translateY(-50%);
+  border-width: 0 10px 10px 10px;
+  width: 0;
+  height: 0;
+  border-bottom-color: #2e6da4;
+  margin-top: 0;
+}
+.slider.slider-horizontal .slider-tick-container {
+  white-space: nowrap;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+}
+.slider.slider-horizontal .slider-tick-label-container {
+  white-space: nowrap;
+  margin-top: 20px;
+}
+.slider.slider-horizontal .slider-tick-label-container .slider-tick-label {
+  padding-top: 4px;
+  display: inline-block;
+  text-align: center;
+}
+.slider.slider-horizontal .tooltip {
+  -ms-transform: translateX(-50%);
+  transform: translateX(-50%);
+}
+.slider.slider-horizontal.slider-rtl .slider-track {
+  left: initial;
+  right: 0;
+}
+.slider.slider-horizontal.slider-rtl .slider-tick,
+.slider.slider-horizontal.slider-rtl .slider-handle {
+  margin-left: initial;
+  margin-right: -10px;
+}
+.slider.slider-horizontal.slider-rtl .slider-tick-container {
+  left: initial;
+  right: 0;
+}
+.slider.slider-horizontal.slider-rtl .tooltip {
+  -ms-transform: translateX(50%);
+  transform: translateX(50%);
+}
+.slider.slider-vertical {
+  height: 210px;
+  width: 20px;
+}
+.slider.slider-vertical .slider-track {
+  width: 10px;
+  height: 100%;
+  left: 25%;
+  top: 0;
+}
+.slider.slider-vertical .slider-selection {
+  width: 100%;
+  left: 0;
+  top: 0;
+  bottom: 0;
+}
+.slider.slider-vertical .slider-track-low,
+.slider.slider-vertical .slider-track-high {
+  width: 100%;
+  left: 0;
+  right: 0;
+}
+.slider.slider-vertical .slider-tick,
+.slider.slider-vertical .slider-handle {
+  margin-top: -10px;
+}
+.slider.slider-vertical .slider-tick.triangle,
+.slider.slider-vertical .slider-handle.triangle {
+  border-width: 10px 0 10px 10px;
+  width: 1px;
+  height: 1px;
+  border-left-color: #2e6da4;
+  border-right-color: #2e6da4;
+  margin-left: 0;
+  margin-right: 0;
+}
+.slider.slider-vertical .slider-tick-label-container {
+  white-space: nowrap;
+}
+.slider.slider-vertical .slider-tick-label-container .slider-tick-label {
+  padding-left: 4px;
+}
+.slider.slider-vertical .tooltip {
+  -ms-transform: translateY(-50%);
+  transform: translateY(-50%);
+}
+.slider.slider-vertical.slider-rtl .slider-track {
+  left: initial;
+  right: 25%;
+}
+.slider.slider-vertical.slider-rtl .slider-selection {
+  left: initial;
+  right: 0;
+}
+.slider.slider-vertical.slider-rtl .slider-tick.triangle,
+.slider.slider-vertical.slider-rtl .slider-handle.triangle {
+  border-width: 10px 10px 10px 0;
+}
+.slider.slider-vertical.slider-rtl .slider-tick-label-container .slider-tick-label {
+  padding-left: initial;
+  padding-right: 4px;
+}
+.slider.slider-disabled .slider-handle {
+  background-image: -webkit-linear-gradient(top, #dfdfdf 0%, #bebebe 100%);
+  background-image: -o-linear-gradient(top, #dfdfdf 0%, #bebebe 100%);
+  background-image: linear-gradient(to bottom, #dfdfdf 0%, #bebebe 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdfdfdf', endColorstr='#ffbebebe', GradientType=0);
+}
+.slider.slider-disabled .slider-track {
+  background-image: -webkit-linear-gradient(top, #e5e5e5 0%, #e9e9e9 100%);
+  background-image: -o-linear-gradient(top, #e5e5e5 0%, #e9e9e9 100%);
+  background-image: linear-gradient(to bottom, #e5e5e5 0%, #e9e9e9 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe5e5e5', endColorstr='#ffe9e9e9', GradientType=0);
+  cursor: not-allowed;
+}
+.slider input {
+  display: none;
+}
+.slider .tooltip {
+  pointer-events: none;
+}
+.slider .tooltip.top {
+  margin-top: -36px;
+}
+.slider .tooltip-inner {
+  white-space: nowrap;
+  max-width: none;
+}
+.slider .hide {
+  display: none;
+}
+.slider-track {
+  position: absolute;
+  cursor: pointer;
+  background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #f9f9f9 100%);
+  background-image: -o-linear-gradient(top, #f5f5f5 0%, #f9f9f9 100%);
+  background-image: linear-gradient(to bottom, #f5f5f5 0%, #f9f9f9 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+}
+.slider-selection {
+  position: absolute;
+  background-image: -webkit-linear-gradient(top, #f9f9f9 0%, #f5f5f5 100%);
+  background-image: -o-linear-gradient(top, #f9f9f9 0%, #f5f5f5 100%);
+  background-image: linear-gradient(to bottom, #f9f9f9 0%, #f5f5f5 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9f9f9', endColorstr='#fff5f5f5', GradientType=0);
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  border-radius: 4px;
+}
+.slider-selection.tick-slider-selection {
+  background-image: -webkit-linear-gradient(top, #8ac1ef 0%, #82b3de 100%);
+  background-image: -o-linear-gradient(top, #8ac1ef 0%, #82b3de 100%);
+  background-image: linear-gradient(to bottom, #8ac1ef 0%, #82b3de 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8ac1ef', endColorstr='#ff82b3de', GradientType=0);
+}
+.slider-track-low,
+.slider-track-high {
+  position: absolute;
+  background: transparent;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  border-radius: 4px;
+}
+.slider-handle {
+  position: absolute;
+  top: 0;
+  width: 20px;
+  height: 20px;
+  background-color: #337ab7;
+  background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+  background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+  background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
+  filter: none;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+  box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+  border: 0px solid transparent;
+}
+.slider-handle:hover {
+  cursor: pointer;
+}
+.slider-handle.round {
+  border-radius: 50%;
+}
+.slider-handle.triangle {
+  background: transparent none;
+}
+.slider-handle.custom {
+  background: transparent none;
+}
+.slider-handle.custom::before {
+  line-height: 20px;
+  font-size: 20px;
+  content: '\2605';
+  color: #726204;
+}
+.slider-tick {
+  position: absolute;
+  cursor: pointer;
+  width: 20px;
+  height: 20px;
+  background-image: -webkit-linear-gradient(top, #f9f9f9 0%, #f5f5f5 100%);
+  background-image: -o-linear-gradient(top, #f9f9f9 0%, #f5f5f5 100%);
+  background-image: linear-gradient(to bottom, #f9f9f9 0%, #f5f5f5 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9f9f9', endColorstr='#fff5f5f5', GradientType=0);
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  filter: none;
+  opacity: 0.8;
+  border: 0px solid transparent;
+}
+.slider-tick.round {
+  border-radius: 50%;
+}
+.slider-tick.triangle {
+  background: transparent none;
+}
+.slider-tick.custom {
+  background: transparent none;
+}
+.slider-tick.custom::before {
+  line-height: 20px;
+  font-size: 20px;
+  content: '\2605';
+  color: #726204;
+}
+.slider-tick.in-selection {
+  background-image: -webkit-linear-gradient(top, #8ac1ef 0%, #82b3de 100%);
+  background-image: -o-linear-gradient(top, #8ac1ef 0%, #82b3de 100%);
+  background-image: linear-gradient(to bottom, #8ac1ef 0%, #82b3de 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8ac1ef', endColorstr='#ff82b3de', GradientType=0);
+  opacity: 1;
+}
diff --git a/resources/css/font-awesome.min.css b/resources/css/font-awesome.min.css
index 24fcc04..123de92 100644
--- a/resources/css/font-awesome.min.css
+++ b/resources/css/font-awesome.min.css
@@ -1,4 +1,4 @@
 /*!
  *  Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.3.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.3.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.3.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.3.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.3.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.3.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;transform:translate(0, 0)}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-genderless:before,.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}
\ No newline at end of file
+ */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.3.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.3.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.3.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.3.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.3.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.3.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;transform:translate(0, 0)}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-genderless:before,.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}
diff --git a/resources/icons/browse/vnfSearchicon.png b/resources/icons/browse/vnfSearchicon.png
new file mode 100644
index 0000000..54ab5ff
--- /dev/null
+++ b/resources/icons/browse/vnfSearchicon.png
diff --git a/resources/icons/browse/vnfSearchicon_active.png b/resources/icons/browse/vnfSearchicon_active.png
new file mode 100644
index 0000000..14c3812
--- /dev/null
+++ b/resources/icons/browse/vnfSearchicon_active.png
diff --git a/resources/icons/browse/vnfSearchicon_hover.png b/resources/icons/browse/vnfSearchicon_hover.png
new file mode 100644
index 0000000..f26dded
--- /dev/null
+++ b/resources/icons/browse/vnfSearchicon_hover.png
diff --git a/resources/icons/byoq/hw_ext.png b/resources/icons/byoq/hw_ext.png
new file mode 100644
index 0000000..afc7e53
--- /dev/null
+++ b/resources/icons/byoq/hw_ext.png
diff --git a/resources/icons/byoq/hw_ext_active.png b/resources/icons/byoq/hw_ext_active.png
new file mode 100644
index 0000000..afc7e53
--- /dev/null
+++ b/resources/icons/byoq/hw_ext_active.png
diff --git a/resources/icons/byoq/hw_ext_hover.png b/resources/icons/byoq/hw_ext_hover.png
new file mode 100644
index 0000000..afc7e53
--- /dev/null
+++ b/resources/icons/byoq/hw_ext_hover.png
diff --git a/resources/icons/byoq/vnfSearchicon.png b/resources/icons/byoq/vnfSearchicon.png
new file mode 100644
index 0000000..54ab5ff
--- /dev/null
+++ b/resources/icons/byoq/vnfSearchicon.png
diff --git a/resources/icons/byoq/vnfSearchicon_active.png b/resources/icons/byoq/vnfSearchicon_active.png
new file mode 100644
index 0000000..14c3812
--- /dev/null
+++ b/resources/icons/byoq/vnfSearchicon_active.png
diff --git a/resources/icons/byoq/vnfSearchicon_hover.png b/resources/icons/byoq/vnfSearchicon_hover.png
new file mode 100644
index 0000000..f26dded
--- /dev/null
+++ b/resources/icons/byoq/vnfSearchicon_hover.png
diff --git a/resources/icons/hw_ext.png b/resources/icons/hw_ext.png
new file mode 100644
index 0000000..afc7e53
--- /dev/null
+++ b/resources/icons/hw_ext.png
diff --git a/resources/icons/hw_ext_active.png b/resources/icons/hw_ext_active.png
new file mode 100644
index 0000000..afc7e53
--- /dev/null
+++ b/resources/icons/hw_ext_active.png
diff --git a/resources/icons/hw_ext_hover.png b/resources/icons/hw_ext_hover.png
new file mode 100644
index 0000000..afc7e53
--- /dev/null
+++ b/resources/icons/hw_ext_hover.png
diff --git a/resources/icons/vnfSearchicon.png b/resources/icons/vnfSearchicon.png
new file mode 100644
index 0000000..54ab5ff
--- /dev/null
+++ b/resources/icons/vnfSearchicon.png
diff --git a/resources/icons/vnfSearchicon_active.png b/resources/icons/vnfSearchicon_active.png
new file mode 100644
index 0000000..14c3812
--- /dev/null
+++ b/resources/icons/vnfSearchicon_active.png
diff --git a/resources/icons/vnfSearchicon_hover.png b/resources/icons/vnfSearchicon_hover.png
new file mode 100644
index 0000000..f26dded
--- /dev/null
+++ b/resources/icons/vnfSearchicon_hover.png
diff --git a/resources/scss/_browse.scss b/resources/scss/_browse.scss
new file mode 100644
index 0000000..b2941aa
--- /dev/null
+++ b/resources/scss/_browse.scss
@@ -0,0 +1,45 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+ .browse-content {
+   margin: 30px;
+
+   div[class^="col-"] {
+    padding-left: 0;
+    padding-right: 0;
+  }
+ }
+
+ .browse-card-content {
+  text-align: left;
+
+  i {
+    margin: 0 auto;
+    cursor: pointer;
+  }
+ }
+
+ .browse-fa {
+    font-size: 96px;
+    font-style: normal;
+    text-align: center;
+    color: #007bff;
+    margin-bottom: 20px !important;
+ }
diff --git a/resources/scss/_custom.scss b/resources/scss/_custom.scss
new file mode 100644
index 0000000..d6b8ffd
--- /dev/null
+++ b/resources/scss/_custom.scss
@@ -0,0 +1,349 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+.model-card {
+	.panel {
+	  background-color: initial;
+	  box-shadow: none;
+	  margin-bottom: 0;
+	}
+  
+	.panel-default > .panel-heading {
+	  padding-left: 0;
+	  border: 0;
+	  padding: 0;
+	  color: #191919;
+	}
+	
+	.panel-default > .panel-heading + .panel-collapse > .panel-body {
+	  overflow-y: scroll;
+	  max-height: 200px;
+	  background-color: #fff;
+	  margin-top: 10px;
+	}
+  }
+
+  .aggregate-card {
+    height: 700px !important;
+    margin: 15px 0;
+
+    .aggregate-card-content {
+      overflow: hidden;
+      margin-left: 12px;
+    }
+
+    .aggregate-attribute {
+      margin-left: 24px;
+    }
+
+    .aggregate-card-content:hover {
+      overflow-y: scroll;
+    }
+
+    .label-default {
+      background-color: #5a5a5a;
+    }
+  }
+  
+  .btn-outline-primary {
+	color: #007bff;
+	background-color: transparent;
+	background-image: none;
+	border-color: #007bff;
+  }
+  
+  .btn-outline-primary:hover {
+	color: #fff;
+	background-color: #007bff;
+	border-color: #007bff;
+  }
+  
+  .btn-outline-primary:focus, .btn-outline-primary.focus {
+	box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
+  }
+  
+  .btn-outline-primary.disabled, .btn-outline-primary:disabled {
+	color: #007bff;
+	background-color: transparent;
+  }
+  
+  .btn-outline-primary:not(:disabled):not(.disabled):active, .btn-outline-primary:not(:disabled):not(.disabled).active,
+  .show > .btn-outline-primary.dropdown-toggle {
+	color: #fff;
+	background-color: #007bff;
+	border-color: #007bff;
+  }
+  
+  .btn-outline-primary:not(:disabled):not(.disabled):active:focus, .btn-outline-primary:not(:disabled):not(.disabled).active:focus,
+  .show > .btn-outline-primary.dropdown-toggle:focus {
+	box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
+  }
+  .model-container .card{
+	height: 400px !important;
+  }
+  .table-header-view th{
+	background: #009fdb;
+	color:#ffffff;
+  }
+  .table-header-view{  
+	color:#ffffff;
+	width:auto !important;
+  }
+  .filter{
+	margin-left:0px !important;
+	margin-right:0px !important;
+  }
+  .filter:last-child {
+	margin-bottom:20px !important;
+  }
+  .react-bootstrap-table table{
+	width:100%;
+	min-width:100%;
+  }
+  .relationshipTable .label-default {
+	background-color: #5a5a5a !important;
+  }
+  .parent-expand-bar {
+	background-color: #81c784;  
+  }
+  .react-bootstrap-table {
+      width: 100%;
+      max-height: 500px;
+      overflow: auto;
+  }
+  .react-bootstrap-table table{
+	font-size:13px;
+  }
+  .react-bootstrap-table table th{
+	word-wrap: break-word;
+	white-space: nowrap;
+  }
+  .filter-label{
+	display:flex;
+	margin-bottom:0px;
+	margin-top:5px;
+  }
+  .nav-tabs > li > a {
+	margin-right: 2px;
+	line-height: 1.42857;
+	border: 1px solid #dfdfdf;
+	border-radius: 10px 10px 0 0px;
+	font-size: 14px;
+	color:#4d6069;
+  }
+  .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
+	color: #FFFFFF;
+	background-color: #009fdb;
+	border: 1px solid transparent;
+	border-bottom-color: transparent;
+	cursor: default;
+  }
+  .multipleNodes .model-container {
+	margin: 0px;
+	//width: max-content;
+  }
+  .multipleNodes .container-fluid{
+	padding-left:2px;
+  }
+  .nav-tabs {
+	padding:0px;
+	border-bottom: 4px solid #009fdb;
+  }
+  .nav-tabs > li {
+	float: left;
+	margin-bottom: -3px;
+  }
+  .table-striped > tbody > tr:nth-child(2n) > td {
+     background-color: #ffffff;
+  }
+  .table-striped > tbody > tr:nth-child(2n+1) > td {
+     background-color: #dddddd;
+  }
+  .table-striped > tbody > tr:hover td {
+    background-color: #009fdb4d;
+  }
+  .table-striped > thead > tr > th {
+      background-color: #009fdb;
+      color: #FFFFFFFF;
+  }
+  .relationshipTable{
+	background:#ffffff;
+  }
+  .relationshipTable th {
+	padding: 5px;
+  }
+  .relationshipTable ul {
+	max-height: 300px;
+	overflow-y: scroll;
+  }
+  .relationshipTable li{
+	padding:10px 0px 10px 3px;
+	border:1px solid #7c8388
+  }
+ .relationshipTable li:nth-child(2n){
+		background-color: #ffffff;
+ }
+ .relationshipTable li:nth-child(2n+1){
+		background-color: #dddddd;
+ }
+ .relationshipTable li:hover{
+	 background-color: #009fdb4d;
+ }
+ .react-bootstrap-table .table-hover tr:hover {
+   cursor: auto !important;
+}
+.react-bootstrap-table td.expand-cell {
+  cursor: pointer !important;
+}
+
+.react-bootstrap-table td{
+  white-space:pre-wrap !important;
+}
+.pre-wrap-text{
+  white-space: pre-wrap !important;
+}
+#downloadRangeForm .radio{
+  margin-top:10px;
+
+}
+#downloadRangeForm input[type='radio']{
+  margin-top:5px;
+}
+#downloadRangeForm input{
+  padding:5px 0px 0px 5px
+}
+#downloadRangeForm span{
+  margin-left:5px;
+}
+#downloadRangeForm .warning{
+  color:#ffa500;
+  font-weight:bold;
+  margin:0px !important;
+}
+#downloadRangeForm{
+  margin:10px 0px;
+}
+#downloadPagePane h2{
+  margin-bottom: 10px;
+}
+#downloadRangeForm input[type=radio]:checked:before{
+  font-size: 34px;
+  text-align: center;
+  line-height: 12px;
+}
+.modal-backdrop.in{
+  opacity:0.5 !important;
+}
+.spinner{
+  z-index:9999 !important;
+}
+.savedQueryTemplate th{
+  background:#69a8c7 !important;
+  padding:2px !important;
+}
+.tab-content .form-control{
+  height:37px !important;
+}
+.alignFormTwinElements{
+  width:48% !important;
+  float:left;
+  margin:0px 5px 0px 0px !important;
+}
+.btn-space{
+  margin: 5px !important;
+}
+#template .btn {
+  padding: 6px 16px;
+  margin: 0.2em;
+  white-space: normal;
+  box-shadow: 1px 2px #0c88d7;
+}
+#template .dropdownButton {
+  width:100%;
+}
+#template .btn-secondary {
+  background-color: #fdfdfd;
+  border: 1px solid #d7dbf6;
+}
+@media (min-width: 768px){
+  #customDslBuilderModel .modal-dialog{
+    width: 700px !important;
+    margin: 30px auto;
+  }
+}
+.dsl-panel .caret{
+    right: 0px !important;
+    top: 12px;
+    position: absolute;
+}
+.dsl-panel .inputFilter{
+  padding: 5px 5px 0px 5px !important;
+  width: 89% !important;
+  margin:3px 0px 5px 0px;
+}
+.dsl-panel .btn{
+  font-size:12px !important;
+}
+.inputBoxError{
+  border: 1px solid #ec110b;
+  padding:2px;
+  margin:1px;
+}
+.toggleSwitch .btn-success, .toggleSwitch .btn-success:hover{
+  color: #fff;
+  background-color:#aadc1f;
+  border-color: #888888 !important;
+}
+.toggleSwitch{
+  position: fixed !important;
+  float: right;
+  z-index: 999;
+  right: 10px;
+  margin:5px;
+  top:-2px;
+}
+.switch.btn {
+  min-width: 4.7rem !important;  
+}
+.switch-off.btn {
+  padding-left: 1.0rem;
+}
+.toggleSwitch .btn-danger, .toggleSwitch .btn-danger:hover{
+  color: #000;
+  background-color: #e9ecef;
+  border-color: #888888;
+}
+.switch.off .switch-group {
+  left: -100%;
+  transition: left 1s;
+}
+.switch.on .switch-group {
+  transition: left 1s;
+}
+.toggleSwitch .btn{
+  border-radius:5px;
+  width:100px;
+}
+.switch-handle {
+  border-radius:0px;
+}
+.toggleSwitch .btn-light{
+  width:0px;
+}
diff --git a/resources/scss/_customByoq.scss b/resources/scss/_customByoq.scss
new file mode 100644
index 0000000..f885eb9
--- /dev/null
+++ b/resources/scss/_customByoq.scss
@@ -0,0 +1,438 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+.tinkerpop-book {
+  background-repeat: no-repeat;
+  height: 300px !important;
+  width: 700px;
+}
+.fixed-panel {
+  position: absolute;
+  top: 100px;
+  width: 20%;
+  right: 20px;
+}
+
+.customDsl .card {
+  position: relative;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  min-width: 0;
+  word-wrap: break-word;
+  background-color: #fff;
+  background-clip: border-box;
+  border: 1px solid rgba(0, 0, 0, 0.125);
+  border-radius: 0.25rem;
+}
+
+.addCardFooter {
+  padding-bottom:50px;
+}
+.card-body {
+  -webkit-box-flex: 1;
+  -ms-flex: 1 1 auto;
+  flex: 1 1 auto;
+  padding: 1.25rem;
+}
+.dark-modal .modal-content {
+  background-color: white;
+  color: #292b2c;
+}
+.dark-modal .close {
+  color: #292b2c;
+}
+.dsl-hint {
+  font-size: 2rem !important;
+  cursor: pointer;
+  height: 0.5rem;
+}
+.dsl-hint:hover {
+  color: #292b2c;
+  background-color: white;
+  cursor: pointer;
+  border-color: #0062cc;
+}
+
+.dsl-hint:focus, .dsl-hint.focus {
+  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
+}
+.card > hr {
+  margin-right: 0;
+  margin-left: 0;
+}
+
+.card > .list-group:first-child .list-group-item:first-child {
+  border-top-left-radius: 0.25rem;
+  border-top-right-radius: 0.25rem;
+}
+
+.card > .list-group:last-child .list-group-item:last-child {
+  border-bottom-right-radius: 0.25rem;
+  border-bottom-left-radius: 0.25rem;
+}
+
+.card-body {
+  -webkit-box-flex: 1;
+  -ms-flex: 1 1 auto;
+  flex: 1 1 auto;
+  padding: 1.25rem;
+}
+
+.card-title {
+  margin-bottom: 0.75rem;
+}
+
+.card-subtitle {
+  margin-top: -0.375rem;
+  margin-bottom: 0;
+}
+
+.card-text:last-child {
+  margin-bottom: 0;
+}
+
+.card-link:hover {
+  text-decoration: none;
+}
+
+.card-link + .card-link {
+  margin-left: 1.25rem;
+}
+
+.card-header-help {
+  padding: 0.75rem 1.25rem;
+  margin-bottom: 0;
+  background-color: rgba(0, 0, 0, 0.03);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.125);
+
+}
+
+.card-header {
+  padding: 0.75rem 1.25rem;
+  margin-bottom: 0;
+  background-color: rgba(0, 0, 0, 0.03);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.125);
+}
+
+.card-header:first-child {
+  border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0;
+}
+
+.card-header + .list-group .list-group-item:first-child {
+  border-top: 0;
+}
+
+.card-footer {
+  padding: 0.75rem 1.25rem;
+  background-color: #f2f2f2;
+  border-top: 1px solid rgba(0, 0, 0, 0.125);
+}
+
+.cfFormat{
+  position:absolute;
+  bottom:0;
+  width:100%;
+}
+
+.card-footer:last-child {
+  border-radius: 0 0 calc(0.25rem - 1px) calc(0.25rem - 1px);
+}
+
+.card-header-tabs {
+  margin-right: -0.625rem;
+  margin-bottom: -0.75rem;
+  margin-left: -0.625rem;
+  border-bottom: 0;
+}
+
+.card-header-pills {
+  margin-right: -0.625rem;
+  margin-left: -0.625rem;
+}
+
+.card-img-overlay {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  padding: 1.25rem;
+}
+
+.card-img {
+  width: 100%;
+  border-radius: calc(0.25rem - 1px);
+}
+
+.card-img-top {
+  width: 100%;
+  border-top-left-radius: calc(0.25rem - 1px);
+  border-top-right-radius: calc(0.25rem - 1px);
+}
+
+.card-img-bottom {
+  width: 100%;
+  border-bottom-right-radius: calc(0.25rem - 1px);
+  border-bottom-left-radius: calc(0.25rem - 1px);
+}
+
+.card-deck {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  -ms-flex-direction: column;
+  flex-direction: column;
+}
+
+.card-deck .card {
+  margin-bottom: 15px;
+}
+
+@media (min-width: 576px) {
+  .card-deck {
+    -webkit-box-orient: horizontal;
+    -webkit-box-direction: normal;
+    -ms-flex-flow: row wrap;
+    flex-flow: row wrap;
+    margin-right: -15px;
+    margin-left: -15px;
+  }
+  .card-deck .card {
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-flex: 1;
+    -ms-flex: 1 0 0%;
+    flex: 1 0 0%;
+    -webkit-box-orient: vertical;
+    -webkit-box-direction: normal;
+    -ms-flex-direction: column;
+    flex-direction: column;
+    margin-right: 15px;
+    margin-bottom: 0;
+    margin-left: 15px;
+  }
+}
+
+.card-group {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  -ms-flex-direction: column;
+  flex-direction: column;
+}
+
+.card-group > .card {
+  margin-bottom: 15px;
+}
+
+@media (min-width: 576px) {
+  .card-group {
+    -webkit-box-orient: horizontal;
+    -webkit-box-direction: normal;
+    -ms-flex-flow: row wrap;
+    flex-flow: row wrap;
+  }
+  .card-group > .card {
+    -webkit-box-flex: 1;
+    -ms-flex: 1 0 0%;
+    flex: 1 0 0%;
+    margin-bottom: 0;
+  }
+  .card-group > .card + .card {
+    margin-left: 0;
+    border-left: 0;
+  }
+  .card-group > .card:first-child {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+  }
+  .card-group > .card:first-child .card-img-top,
+  .card-group > .card:first-child .card-header {
+    border-top-right-radius: 0;
+  }
+  .card-group > .card:first-child .card-img-bottom,
+  .card-group > .card:first-child .card-footer {
+    border-bottom-right-radius: 0;
+  }
+  .card-group > .card:last-child {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+  .card-group > .card:last-child .card-img-top,
+  .card-group > .card:last-child .card-header {
+    border-top-left-radius: 0;
+  }
+  .card-group > .card:last-child .card-img-bottom,
+  .card-group > .card:last-child .card-footer {
+    border-bottom-left-radius: 0;
+  }
+  .card-group > .card:only-child {
+    border-radius: 0.25rem;
+  }
+  .card-group > .card:only-child .card-img-top,
+  .card-group > .card:only-child .card-header {
+    border-top-left-radius: 0.25rem;
+    border-top-right-radius: 0.25rem;
+  }
+  .card-group > .card:only-child .card-img-bottom,
+  .card-group > .card:only-child .card-footer {
+    border-bottom-right-radius: 0.25rem;
+    border-bottom-left-radius: 0.25rem;
+  }
+  .card-group > .card:not(:first-child):not(:last-child):not(:only-child) {
+    border-radius: 0;
+  }
+  .card-group > .card:not(:first-child):not(:last-child):not(:only-child) .card-img-top,
+  .card-group > .card:not(:first-child):not(:last-child):not(:only-child) .card-img-bottom,
+  .card-group > .card:not(:first-child):not(:last-child):not(:only-child) .card-header,
+  .card-group > .card:not(:first-child):not(:last-child):not(:only-child) .card-footer {
+    border-radius: 0;
+  }
+}
+
+.card-columns .card {
+  margin-bottom: 0.75rem;
+}
+
+@media (min-width: 576px) {
+  .card-columns {
+    -webkit-column-count: 3;
+    -moz-column-count: 3;
+    column-count: 3;
+    -webkit-column-gap: 1.25rem;
+    -moz-column-gap: 1.25rem;
+    column-gap: 1.25rem;
+  }
+  .card-columns .card {
+    display: inline-block;
+    width: 100%;
+  }
+}
+
+.text-center {
+  text-align: center !important;
+}
+
+.text-white {
+  color: #fff !important;
+}
+.customDsl a.bg-primary:hover, a.bg-primary:focus,
+button.bg-primary:hover,
+button.bg-primary:focus {
+  background-color: #0062cc !important;
+}
+
+.form-group {
+  margin-bottom: 1rem;
+}
+.dsl-hint-form-group {
+  margin-bottom: 1rem;
+  margin-top: 25px;
+}
+
+.customDsl pre,
+code,
+kbd,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+
+.customDsl pre {
+  margin-top: 0;
+  margin-bottom: 1rem;
+  overflow: auto;
+  display: block;
+  padding: 0px;
+  font-size: 13px;
+  line-height: 1.42857;
+  word-break: break-all;
+  word-wrap: break-word;
+  color: #191919;
+  background-color: #ffffff;
+  border: none;
+  border-radius: 0;
+}
+.customDsl pre {
+  white-space: pre-wrap !important;
+}
+
+blockquote {
+  border: 1px solid #999;
+  page-break-inside: avoid;
+}
+
+.customDsl [class*="licon-"]::before, .customDsl [class*="icon-"]::after {
+  font-size: 8em;
+  height: 8em;
+}
+.hidden {
+  display:none;
+}
+.show{
+  display:block;
+}
+
+.customDsl .btn i {
+  font-size: 30px;
+  font-style: normal;
+  text-align: center;
+  color: #007bff;
+}
+.node {
+  cursor: pointer;
+}
+
+.node circle {
+  fill: #fff;
+  stroke: steelblue;
+  stroke-width: 1.5px;
+}
+
+.node text {
+  font: 10px sans-serif;
+}
+
+.link {
+  fill: none;
+  stroke: #ccc;
+  stroke-width: 1.5px;
+}
+
+.dsl-panel .panel{
+    margin-bottom: 0px !important;
+}
+.actionsRow {
+    white-space: nowrap;
+}
+
+.toggle-theme.react-toggle--checked .react-toggle-track {
+  background-color: #009fdb;
+}
diff --git a/resources/scss/_spinner.scss b/resources/scss/_spinner.scss
new file mode 100644
index 0000000..3803b65
--- /dev/null
+++ b/resources/scss/_spinner.scss
@@ -0,0 +1,35 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+.spin-container {
+  overflow: hidden;
+  position: relative;
+}
+
+.spinner {
+  position: absolute;
+  z-index: 999;
+  left: 50%;
+  top: 45%;
+}
+
+.spin-content {
+  opacity: 0.2;
+}
diff --git a/resources/scss/_typography.scss b/resources/scss/_typography.scss
new file mode 100644
index 0000000..982c6bd
--- /dev/null
+++ b/resources/scss/_typography.scss
@@ -0,0 +1,27 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+
+$heading-font-2: 20px;
+$heading-font-3: 18px;
+$heading-font-4: 16px;
+
+$body-font-1: 16px;
+$body-font-2: 14px;
diff --git a/resources/scss/_variables.scss b/resources/scss/_variables.scss
new file mode 100644
index 0000000..fd15be9
--- /dev/null
+++ b/resources/scss/_variables.scss
@@ -0,0 +1,41 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+$minimum-application-width: 1000px;
+
+$neutral-gray: #b7bfc3;
+$light-gray: #cfd6d9;
+$very-light-gray: #eff3f3;
+$turquoise-blue: #01afd1;
+$dark-blue: #004b68;
+$darkest: #323b3f;
+$dark-gray: #7c8388;
+$bluish-gray: #72848c;
+$redish-orange: #fe7550;
+$amber: #fab32b;
+$red: #d03d3c;
+
+$border-color7: $amber;
+$border-color10: $red;
+$border-color12: $redish-orange;
+
+
+/* Textures */
+$images-folder-name: "../icons";
diff --git a/resources/scss/bootstrap-cust/_buttons.scss b/resources/scss/bootstrap-cust/_buttons.scss
index 92382aa..c1f2984 100644
--- a/resources/scss/bootstrap-cust/_buttons.scss
+++ b/resources/scss/bootstrap-cust/_buttons.scss
@@ -5,3 +5,37 @@
 .btn-info {
   @include button-variant($text-color1, $background-color12, $text-color7);
 }
+
+.btn-outline-primary {
+    color: #007bff;
+    background-color: transparent;
+    background-image: none;
+    border-color: #007bff;
+}
+
+.btn-outline-primary:hover {
+    color: #fff;
+    background-color: #007bff;
+    border-color: #007bff;
+}
+
+.btn-outline-primary:focus, .btn-outline-primary.focus {
+    box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
+}
+
+.btn-outline-primary.disabled, .btn-outline-primary:disabled {
+    color: #007bff;
+    background-color: transparent;
+}
+
+.btn-outline-primary:not(:disabled):not(.disabled):active, .btn-outline-primary:not(:disabled):not(.disabled).active,
+.show > .btn-outline-primary.dropdown-toggle {
+    color: #fff;
+    background-color: #007bff;
+    border-color: #007bff;
+}
+
+.btn-outline-primary:not(:disabled):not(.disabled):active:focus, .btn-outline-primary:not(:disabled):not(.disabled).active:focus,
+.show > .btn-outline-primary.dropdown-toggle:focus {
+    box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
+}
diff --git a/resources/scss/bootstrap-cust/_card.scss b/resources/scss/bootstrap-cust/_card.scss
new file mode 100644
index 0000000..815b5e9
--- /dev/null
+++ b/resources/scss/bootstrap-cust/_card.scss
@@ -0,0 +1,262 @@
+.card {
+  position: relative;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  min-width: 0;
+  height: 300px;
+  word-wrap: break-word;
+  background-color: #fff;
+  background-clip: border-box;
+  border: 1px solid rgba(0, 0, 0, 0.125);
+  border-radius: 0.25rem;
+}
+
+.addCardFooter {
+  padding-bottom: 50px;
+}
+
+.card-content {
+  margin: 16px;
+  height: 100%;
+}
+
+.card > hr {
+  margin-right: 0;
+  margin-left: 0;
+}
+
+.card > .list-group:first-child .list-group-item:first-child {
+  border-top-left-radius: 0.25rem;
+  border-top-right-radius: 0.25rem;
+}
+
+.card > .list-group:last-child .list-group-item:last-child {
+  border-bottom-right-radius: 0.25rem;
+  border-bottom-left-radius: 0.25rem;
+}
+
+.card-body {
+  -webkit-box-flex: 1;
+  -ms-flex: 1 1 auto;
+  flex: 1 1 auto;
+  padding: 1.25rem;
+}
+
+.card-subtitle {
+  margin-top: -0.375rem;
+  margin-bottom: 0;
+}
+
+.card-text:last-child {
+  margin-bottom: 0;
+}
+
+.card-link:hover {
+  text-decoration: none;
+}
+
+.card-link + .card-link {
+  margin-left: 1.25rem;
+}
+
+.card-header-help {
+  padding: 0.75rem 1.25rem;
+  width:100%;
+  margin-bottom: 0;
+  background-color: rgba(0, 0, 0, 0.03);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.125);
+}
+
+.card-header {
+  padding: 0.75rem 0.75rem;
+  margin-bottom: 0;
+  background-color: rgba(0, 0, 0, 0.03);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.125);
+}
+
+.card-header:first-child {
+  border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0;
+}
+
+.card-header + .list-group .list-group-item:first-child {
+  border-top: 0;
+}
+
+.card-footer {
+  padding: 0.75rem 0.75rem;
+  background-color: #f2f2f2;
+  border-top: 1px solid rgba(0, 0, 0, 0.125);
+}
+
+.card-footer:last-child {
+  border-radius: 0 0 calc(0.25rem - 1px) calc(0.25rem - 1px);
+}
+
+.card-header-tabs {
+  margin-right: -0.625rem;
+  margin-bottom: -0.75rem;
+  margin-left: -0.625rem;
+  border-bottom: 0;
+}
+
+.card-header-pills {
+  margin-right: -0.625rem;
+  margin-left: -0.625rem;
+}
+
+.card-img-overlay {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  padding: 1.25rem;
+}
+
+.card-img {
+  width: 100%;
+  border-radius: calc(0.25rem - 1px);
+}
+
+.card-img-top {
+  width: 100%;
+  border-top-left-radius: calc(0.25rem - 1px);
+  border-top-right-radius: calc(0.25rem - 1px);
+}
+
+.card-img-bottom {
+  width: 100%;
+  border-bottom-right-radius: calc(0.25rem - 1px);
+  border-bottom-left-radius: calc(0.25rem - 1px);
+}
+
+.card-deck {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  -ms-flex-direction: column;
+  flex-direction: column;
+}
+
+.card-deck .card {
+  margin-bottom: 15px;
+}
+
+@media (min-width: 576px) {
+  .card-deck {
+    -webkit-box-orient: horizontal;
+    -webkit-box-direction: normal;
+    -ms-flex-flow: row wrap;
+    flex-flow: row wrap;
+    margin-right: -15px;
+    margin-left: -15px;
+  }
+  .card-deck .card {
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-flex: 1;
+    -ms-flex: 1 0 0%;
+    flex: 1 0 0%;
+    -webkit-box-orient: vertical;
+    -webkit-box-direction: normal;
+    -ms-flex-direction: column;
+    flex-direction: column;
+    margin-right: 15px;
+    margin-bottom: 0;
+    margin-left: 15px;
+  }
+}
+
+.card-group {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  -ms-flex-direction: column;
+  flex-direction: column;
+}
+
+.card-group > .card {
+  margin-bottom: 15px;
+}
+
+@media (min-width: 576px) {
+  .card-group {
+    -webkit-box-orient: horizontal;
+    -webkit-box-direction: normal;
+    -ms-flex-flow: row wrap;
+    flex-flow: row wrap;
+  }
+  .card-group > .card {
+    -webkit-box-flex: 1;
+    -ms-flex: 1 0 0%;
+    flex: 1 0 0%;
+    margin-bottom: 0;
+  }
+  .card-group > .card + .card {
+    margin-left: 0;
+    border-left: 0;
+  }
+  .card-group > .card:first-child {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+  }
+  .card-group > .card:first-child .card-img-top, .card-group > .card:first-child .card-header {
+    border-top-right-radius: 0;
+  }
+  .card-group > .card:first-child .card-img-bottom, .card-group > .card:first-child .card-footer {
+    border-bottom-right-radius: 0;
+  }
+  .card-group > .card:last-child {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+  .card-group > .card:last-child .card-img-top, .card-group > .card:last-child .card-header {
+    border-top-left-radius: 0;
+  }
+  .card-group > .card:last-child .card-img-bottom, .card-group > .card:last-child .card-footer {
+    border-bottom-left-radius: 0;
+  }
+  .card-group > .card:only-child {
+    border-radius: 0.25rem;
+  }
+  .card-group > .card:only-child .card-img-top, .card-group > .card:only-child .card-header {
+    border-top-left-radius: 0.25rem;
+    border-top-right-radius: 0.25rem;
+  }
+  .card-group > .card:only-child .card-img-bottom, .card-group > .card:only-child .card-footer {
+    border-bottom-right-radius: 0.25rem;
+    border-bottom-left-radius: 0.25rem;
+  }
+  .card-group > .card:not(:first-child):not(:last-child):not(:only-child) {
+    border-radius: 0;
+  }
+}
+
+.card-columns .card {
+  margin-bottom: 0.75rem;
+}
+
+@media (min-width: 576px) {
+  .card-columns {
+    -webkit-column-count: 3;
+    -moz-column-count: 3;
+    column-count: 3;
+    -webkit-column-gap: 1.25rem;
+    -moz-column-gap: 1.25rem;
+    column-gap: 1.25rem;
+  }
+  .card-columns .card {
+    display: inline-block;
+    width: 100%;
+  }
+}
diff --git a/resources/scss/bootstrap-cust/_panels.scss b/resources/scss/bootstrap-cust/_panels.scss
index 9ee5622..74f7424 100644
--- a/resources/scss/bootstrap-cust/_panels.scss
+++ b/resources/scss/bootstrap-cust/_panels.scss
@@ -1,3 +1,25 @@
 .panel {
   border: none;
-}
\ No newline at end of file
+}
+
+.model-card {
+  .panel {
+    background-color: initial;
+    box-shadow: none;
+    margin-bottom: 0;
+  }
+
+  .panel-default > .panel-heading {
+    padding-left: 0;
+    border: 0;
+    padding: 0;
+    color: #191919 !important;
+  }
+  
+  .panel-default > .panel-heading + .panel-collapse > .panel-body {
+    overflow-y: scroll;
+    max-height: 250px;
+    background-color: #fff;
+    margin-top: 15px;
+  }
+}
diff --git a/resources/scss/bootstrap.scss b/resources/scss/bootstrap.scss
index a42e5e7..e3cb012 100644
--- a/resources/scss/bootstrap.scss
+++ b/resources/scss/bootstrap.scss
@@ -21,7 +21,7 @@
 // ONAP CORE
 @import "common/variables";
 
-// Import Typography Section 
+// Import Typography Section
 @import "common/typography";
 
 
@@ -71,6 +71,7 @@
 @import "bootstrap-cust/list-group";
 @import "bootstrap/panels";
 @import "bootstrap-cust/panels";
+@import "bootstrap-cust/card";
 // @import "bootstrap/responsive-embed";
 //@import "bootstrap/wells";
 @import "bootstrap/close";
diff --git a/resources/scss/common/_layout.scss b/resources/scss/common/_layout.scss
index 11265c5..0d826f3 100644
--- a/resources/scss/common/_layout.scss
+++ b/resources/scss/common/_layout.scss
@@ -26,6 +26,7 @@
 	display: flex;
 	flex-direction: column;
 	height: 100vh;
+    overflow:auto;
 }
 
 .view-container {
@@ -38,8 +39,7 @@
 .showContainer {
 }
 
-.spin-container {
-	overflow: hidden;
+.spinner-container {
 	position: relative;
 }
 
@@ -50,6 +50,6 @@
 	top: 49%;
 }
 
-.spin-content {
+.spinner-content {
 	opacity: 0.2;
 }
diff --git a/resources/scss/common/_variables.scss b/resources/scss/common/_variables.scss
index 9c4bddb..87de010 100644
--- a/resources/scss/common/_variables.scss
+++ b/resources/scss/common/_variables.scss
@@ -37,7 +37,7 @@ $acadia-brown: #5a5a5a;
 $light-gray: #cfd6d9;
 $light-gray-2: #d2d2d2;
 $neutral-gray: #b7bfc3;
-$dark-gray: #7c8388;
+$dark-gray: #191919;
 $t-blue: #0396b4;
 $light-green: #d1de42;
 $amber: #fab32b;
diff --git a/resources/scss/customQuery/_customQuery.scss b/resources/scss/customQuery/_customQuery.scss
new file mode 100644
index 0000000..06e8cbd
--- /dev/null
+++ b/resources/scss/customQuery/_customQuery.scss
@@ -0,0 +1,84 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+.addPadding {
+  margin-right: 50px;
+  margin-left: 50px;
+  margin-top: 20px;
+}
+.addPaddingTop {
+  margin-top: 20px;
+}
+.addPaddingSide {
+  margin-left: 20px;
+}
+.addPaddingLeft {
+  margin-left: 5px;
+}
+.my-4 {
+  margin-top: 1.5rem !important;
+}
+.display-2 {
+  font-size: 5.5rem;
+  font-weight: 300;
+  line-height: 1.2;
+}
+.lead {
+  color: #191919;
+  font-family: 'Omnes-Regular';
+  font-size: 2.4rem;
+  line-height: 2.8rem;
+  margin-top: 10px;
+  letter-spacing: -0.024rem;
+}
+.jumbotron {
+  padding: 2rem 1rem;
+  margin-bottom: 2rem;
+  background-color: #e9ecef;
+  border-radius: 0.3rem;
+}
+.cardwrap {
+  //word-wrap: break-word;
+  //overflow-wrap: break-word;
+  //word-break: break-all;
+  -ms-word-wrap: break-word;
+  word-wrap: break-word;
+}
+.dropdown-menu {
+  display: flow;
+  min-width: 360px;
+}
+.hidden {
+  display:none;
+}
+.show{
+  display:block;
+}
+.invalid {
+  border: 1px solid red;
+  background-color: #FDA49A;
+  color: white;
+}
+.cardWrapHeaderTxt {
+  font-weight: bold;
+  font-style: italic;
+  text-align: center;
+  color: blue;
+}
diff --git a/resources/scss/filter/_filter.scss b/resources/scss/filter/_filter.scss
new file mode 100644
index 0000000..cdfc983
--- /dev/null
+++ b/resources/scss/filter/_filter.scss
@@ -0,0 +1,135 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+.badgeFilter {
+    color: #31708f;
+    background-color: #fff;
+    display: inline-block;
+    white-space: nowrap;
+    vertical-align: baseline;
+    box-sizing: border-box;
+    border-radius: 1em;
+    border-color: #009fdb;
+    margin: 0.4em 0.4em 0.4em 0em;
+    padding: 1px;
+    box-shadow: 1px 2px #abe0f5;
+    border: 1px solid #7fd6f8;
+    font-size: 0.9em;
+}
+
+.badgeFilter span{
+    float: left;
+    padding: 0.1em 0.2em;
+}
+
+.badgeFilter .close{
+    float:left;
+    color:#363434 !important
+}
+
+.leftNavSelection {
+    color:#ffffff;
+    background-color: #009fdb;
+    box-sizing : border-box;
+    border-radius: 0.2em;
+    border-color: #009fdb;
+}
+
+.leftNavSelection div:hover {
+    color:#000;
+    background-color: #ffffff;    
+}
+.leftNavSelected {
+    color:#ffffff;
+    background-color: #e99b0a;
+    box-sizing : border-box;
+    border-radius: 0.2em;
+    border-color: #f59505;
+}
+#filters {
+    margin:20px 0px 20px 20px;
+}
+.leftNavSelection header {
+    margin:20px 0px 0px 0px;
+    border-bottom:1px solid #fff;
+    font-size: 16px;
+    padding: 0.25em;    
+}
+.mainSectionSelection .panel-primary {
+    border: 1px solid transparent;
+    border-color: #009fdb;
+    border-radius: 1;
+}
+#filterPane .btn {
+    padding: 6px 16px;
+    margin: 0.2em;
+    white-space: normal;
+    box-shadow: 1px 2px #0c88d7;
+}
+#filterPane .dropdownButton {
+    width:100%;
+}
+#filterPane .btn-secondary {
+    background-color: #fdfdfd;
+    border: 1px solid #d7dbf6;
+}
+
+#filterPane .dropdown{
+    width:100%;
+}
+
+#filterPane .caret, #template .caret {
+    right: 0px;
+    top: 12px;
+    position: absolute;
+    margin: 0.2em;
+}
+#filterPane input {
+    padding:5px 5px 7px 5px;
+}
+.topBottomMargin {
+    margin:0.5em 0em;
+}
+#filterPane .label {
+    display: inline-block;
+    padding: 0.9em;
+    margin: 1em 0em;
+}
+.custom-container{
+    margin-right: auto;
+    margin-left: auto;
+    padding-left: 0px;
+    padding-right: 0px;
+    width: inherit;
+}
+.removeLeftPadding{
+    padding-left:0px !important;
+}
+.resultMessage{
+    font-size: 20px;
+    font-family: inherit;
+    font-weight: 500;
+    line-height: 5;
+    color: inherit;
+}
+.badgeFilter i{
+    font-style: italic;
+    font-size: 0.9em !important;
+}
diff --git a/resources/scss/header/_layout.scss b/resources/scss/header/_layout.scss
index 14d90ac..2d63f00 100644
--- a/resources/scss/header/_layout.scss
+++ b/resources/scss/header/_layout.scss
@@ -137,6 +137,11 @@
     margin-bottom: 5px;
   }
 
+  .font-awesome-icon{
+    font-size: 32px;
+    margin-top: 5px;
+  }
+
   .main-menu-button {
     background-color: transparent;
     border: none;
@@ -159,6 +164,22 @@
       background-image: url($icons-folder-path + '/vnfSearchicon.png');
     }
 
+    .browse-button-icon {
+      background-image: url($icons-folder-path + '/vnfSearchicon.png');
+    }
+
+    .byoq-ext-button-icon {
+      background-image: url($icons-folder-path + '/vnfSearchicon.png');
+    }
+
+    .custom-query-button-icon {
+      background-image: url($icons-folder-path + '/vnfSearchicon.png');
+    }
+
+    .specialized-search-button-icon {
+      background-image: url($icons-folder-path + '/vnfSearchicon.png');
+    }
+
     .configurable-view-button-icon {
       background-image: url($icons-folder-path + '/reports.svg');
       -webkit-filter: brightness(500);
@@ -181,6 +202,22 @@
       background-image: url($icons-folder-path + '/vnfSearchicon_hover.png');
     }
 
+    .browse-button-icon {
+      background-image: url($icons-folder-path + '/vnfSearchicon_hover.png');
+    }
+
+    .byoq-ext-button-icon {
+      background-image: url($icons-folder-path + '/vnfSearchicon_hover.png');
+    }
+
+    .custom-query-button-icon {
+      background-image: url($icons-folder-path + '/vnfSearchicon_hover.png');
+    }
+
+    .specialized-search-button-icon {
+      background-image: url($icons-folder-path + '/vnfSearchicon_hover.png');
+    }
+
     .configurable-view-button-icon {
       background-image: url($icons-folder-path + '/reports.svg');
       -webkit-filter: brightness(1);
@@ -211,6 +248,22 @@
       background-image: url($icons-folder-path + '/vnfSearchicon_active.png');
     }
 
+    .browse-button-icon {
+      background-image: url($icons-folder-path + '/vnfSearchicon_active.png');
+    }
+
+    .byoq-ext-button-icon {
+      background-image: url($icons-folder-path + '/vnfSearchicon_active.png');
+    }
+
+    .custom-query-button-icon {
+      background-image: url($icons-folder-path + '/vnfSearchicon_active.png');
+    }
+
+    .specialized-search-button-icon {
+      background-image: url($icons-folder-path + '/vnfSearchicon_active.png');
+    }
+
     .configurable-view-button-icon {
       background-image: url($icons-folder-path + '/reports.svg');
       -webkit-filter: brightness(0.55);
diff --git a/resources/scss/model/_model.scss b/resources/scss/model/_model.scss
new file mode 100644
index 0000000..a6d8dc8
--- /dev/null
+++ b/resources/scss/model/_model.scss
@@ -0,0 +1,183 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+.model-container {
+  margin: 30px;
+
+  i {
+    font-size: 30px;
+  }
+}
+
+.model-gallery {
+  padding-left: 15px;
+  padding-right: 15px;
+
+  div[class^="col-"] {
+    padding-left: 0;
+    padding-right: 0;
+  }
+}
+
+.model-card {
+  height: 500px !important;
+  margin: 15px 0;
+
+  .model-card-content {
+    overflow: hidden;
+    margin-left: 24px;
+  }
+  
+  .model-card-content:hover {
+    overflow-y: scroll;
+  }
+
+  .label-default {
+    background-color: #5a5a5a;
+  }
+}
+
+.d3-model-card {
+   height: 700px !important;
+   margin: 15px 0;
+
+   .model-card-header{
+     color: #FFFFFF;
+     background-color: #48a9fb;
+   }
+
+   .model-card-content {
+     overflow: hidden;
+     overflow-x: auto;
+     height: 700px !important;
+     margin-left: 24px;
+   }
+
+   .model-card-content:hover {
+     overflow-y: scroll;
+   }
+
+   .label-default {
+     background-color: #5a5a5a;
+   }
+ }
+ .template-textarea {
+    height: 300px !important
+ }
+ .model-template-card {
+   height: 500px !important;
+   margin: 15px 0;
+
+   .model-card-header{
+     color: #FFFFFF;
+     background-color: #48a9fb;
+   }
+
+   .model-card-content {
+     overflow: hidden;
+     height: 500px !important;
+     margin-left: 24px;
+   }
+
+   .model-card-content:hover {
+     overflow-y: scroll;
+   }
+
+   .label-default {
+     background-color: #5a5a5a;
+   }
+ }
+.d3-history-query-card {
+   height: 750px !important;
+   margin: 15px 0;
+
+   .history-query-card-header{
+     color: #FFFFFF;
+     background-color: #48a9fb;
+   }
+
+   .history-query-card-content {
+     overflow: hidden;
+     height: 750px !important;
+     margin-left: 24px;
+   }
+
+   .history-query-card-content:hover {
+     overflow-y: scroll;
+   }
+
+   .label-default {
+     background-color: #5a5a5a;
+   }
+ }
+
+
+.custom-accordion{
+  background-color: white !important;
+  border-radius: 8px;
+}
+
+.modal-override{
+  max-width: 1350 !important;
+  width: 1350px !important;
+}
+.tabIconChosen{
+    color:#FFFFFF !important;
+}
+.tabIconNotChosen{
+    color:#000000 !important;
+}
+.animationControlIcon{
+    font-size: 35px !important;
+}
+i.animationControlIcon:hover {
+  color: #97b0bf !important;
+}
+i.animationControlIcon:active {
+    color: #4f5b67 !important;
+}
+.animationPlayingIcon{
+    font-size: 35px !important;
+    color: #1bd645 !important;
+}
+.animationStoppedIcon{
+    font-size: 35px !important;
+    color: #ff0016 !important;
+}
+.animationPausedIcon{
+    font-size: 35px !important;
+    color: #4f5b67 !important;
+}
+
+.nodeIcon-deleted{
+ background-color: orangered !important;
+ color: white !important;
+ border-radius: 10px;
+}
+.nodeIcon-created{
+ background-color: #8ed422 !important;
+ color: white !important;
+ border-radius: 10px;
+}
+.nodeIcon-modified{
+ background-color: orange !important;
+ color: white !important;
+ border-radius: 10px;
+}
diff --git a/resources/scss/style.scss b/resources/scss/style.scss
index ca81d2f..af239e8 100644
--- a/resources/scss/style.scss
+++ b/resources/scss/style.scss
@@ -18,6 +18,18 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 @import "common";
 @import "components";
 @import "modules";
+@import "_variables";
+@import "_typography";
+@import "_spinner";
+@import "filter/filter.scss";
+@import "bootstrap-cust/card";
+@import "_custom";
+
+@import "browse";
+@import "model/model.scss";
+@import "_customByoq.scss";
+@import "customQuery/customQuery.scss";
diff --git a/resources/scss/tier-support/_search.scss b/resources/scss/tier-support/_search.scss
index 892d303..fc15371 100644
--- a/resources/scss/tier-support/_search.scss
+++ b/resources/scss/tier-support/_search.scss
@@ -28,8 +28,9 @@
 }
 
 .auto-complete-search-button-group {
-  position: absolute !important;
-  padding-top: 3px;
+  position: inherit !important;
+  display: inline-block !important;
+  vertical-align: bottom !important;
 }
 
 .auto-complete-search input.form-control {
@@ -43,6 +44,13 @@
   border: solid 1px $search-border-color1;
 }
 
+.auto-complete-help-button, .auto-complete-help-button:focus {
+  background-color: $white;
+  width: 45px;
+  height: 30px;
+  border: solid 1px $search-border-color1;
+}
+
 .auto-complete-search button:hover {
   background-color: $search-background-color1;
 }
@@ -53,11 +61,22 @@
   background-color: $search-button-background-color;
 }
 
+.auto-complete-search .fa-question-circle {
+  font-size: 1em;
+  line-height: 1em;
+  background-color: $white;
+}
+
 .auto-complete-search button:hover .fa-search {
   color: $primary-background-color;
   background-color: $search-background-color1;
 }
 
+.auto-complete-search button:hover .fa-question-circle {
+  color: $primary-background-color;
+  background-color: $search-background-color1;
+}
+
 .auto-complete-search .btn-group .auto-complete-clear-button {
   border: none;
   margin-left: -35px !important;
@@ -189,3 +208,12 @@
   background-color:inherit;
   padding: 0px;
 }
+
+.modal-searchable {
+  height: 500px !important;
+  margin: 15px 0;
+  overflow-y: scroll;
+}
+.modal-searchable:hover {
+  overflow-y: scroll;
+}
diff --git a/resources/styles/images/svg/master/controls/magnifyingglass.svg b/resources/styles/images/svg/master/controls/magnifyingglass.svg
new file mode 100644
index 0000000..0f40f6b
--- /dev/null
+++ b/resources/styles/images/svg/master/controls/magnifyingglass.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" enable-background="new 0 0 36 36"><path d="M27.847 8.26c-1.805-1.803-4.202-2.795-6.751-2.795-2.548 0-4.945.993-6.749 2.796-1.803 1.803-2.796 4.2-2.796 6.75 0 1.879.543 3.681 1.576 5.242l-7.059 7.059c-.357.356-.554.831-.554 1.336-.001.505.196.98.554 1.337.357.356.832.552 1.336.552.503 0 .977-.196 1.336-.553l7.047-7.048c1.576 1.062 3.402 1.622 5.309 1.622 2.55 0 4.948-.993 6.751-2.796 1.803-1.804 2.796-4.201 2.796-6.751 0-2.549-.993-4.947-2.796-6.751zm-6.761.96c3.186 0 5.778 2.592 5.778 5.778 0 3.186-2.592 5.778-5.778 5.778-3.186 0-5.778-2.592-5.778-5.778 0-3.185 2.592-5.778 5.778-5.778z" fill="#0568ae"/></svg>
\ No newline at end of file
diff --git a/resources/views/defaultViews.json b/resources/views/defaultViews.json
new file mode 100644
index 0000000..899e9ee
--- /dev/null
+++ b/resources/views/defaultViews.json
@@ -0,0 +1,139 @@
+[
+  {
+    "viewName": "browse",
+    "componentName": "Browse",
+    "displayName": "Browse",
+    "iconClass": "browse-button-icon"
+  },
+  {
+    "viewName": "customDsl",
+    "componentName": "CustomDsl",
+    "displayName": "BYOQ",
+    "iconClass": "byoq-ext-button-icon",
+    "param": "",
+    "viewParams": "",
+    "isExact": true,
+    "onlyRoute": false
+  },
+  {
+    "viewName": "customDsl",
+    "componentName": "CustomDsl",
+    "displayName": "BYOQ",
+    "iconClass": "byoq-ext-button-icon",
+    "param": "",
+    "viewParams": "/:type/:propId/:relArray",
+    "isExact": true,
+    "onlyRoute": true
+  },
+  {
+    "viewName": "customDsl",
+    "componentName": "CustomDsl",
+    "displayName": "BYOQ",
+    "iconClass": "byoq-ext-button-icon",
+    "param": "",
+    "viewParams": "/:type/:propId",
+    "isExact": true,
+    "onlyRoute": true
+  },
+  {
+    "viewName": "customDslBuilder",
+    "componentName": "CustomDslBuilder",
+    "displayName": "BYOQ Builder",
+    "iconClass": "byoq-ext-button-icon",
+    "param": "",
+    "viewParams": "/:type/:propId",
+    "isExact": true,
+    "onlyRoute": true
+  },
+  {
+    "viewName": "customDslBuilder",
+    "componentName": "CustomDslBuilder",
+    "displayName": "BYOQ Builder",
+    "iconClass": "byoq-ext-button-icon",
+    "param": "",
+    "isExact": true,
+    "onlyRoute": false
+  },
+  {
+    "viewName": "savedDsl",
+    "componentName": "CustomDsl",
+    "displayName": "Saved Queries",
+    "iconClass": "byoq-ext-button-icon",
+    "param": "",
+    "viewParams": "",
+    "isExact": true,
+    "onlyRoute": false
+  },
+  {
+    "viewName": "savedDsl",
+    "componentName": "CustomDsl",
+    "displayName": "Saved Queries",
+    "iconClass": "byoq-ext-button-icon",
+    "param": "",
+    "viewParams": "/:type/:propId/:relArray",
+    "isExact": true,
+    "onlyRoute": true
+  },
+  {
+    "viewName": "savedDsl",
+    "componentName": "CustomDsl",
+    "displayName": "Saved Queries",
+    "iconClass": "byoq-ext-button-icon",
+    "param": "",
+    "viewParams": "/:type/:propId",
+    "isExact": true,
+    "onlyRoute": true
+  },
+  {
+    "viewName": "customQuery",
+    "componentName": "CustomQuery",
+    "displayName": "Custom Query",
+    "iconClass": "custom-query-button-icon"
+  },
+  {
+    "viewName": "model",
+    "componentName": "Model",
+    "displayName": "Model",
+    "iconClass": "browse-button-icon",
+    "param": "",
+    "viewParams": "/:type",
+    "isExact": true,
+    "onlyRoute": true
+  },
+  {
+    "viewName": "model",
+    "componentName": "Model",
+    "displayName": "Model",
+    "iconClass": "browse-button-icon",
+    "param": "",
+    "viewParams": "/:type/:nodeId/:page",
+    "isExact": false,
+    "onlyRoute": true
+  },
+  {
+    "viewName": "history",
+    "componentName": "History",
+    "displayName": "History",
+    "iconClass": "browse-button-icon",
+    "param": "",
+    "viewParams": "/:type/:nodeType/:nodeUriEnc/:epochTime",
+    "isExact": false,
+    "onlyRoute": true
+  },
+  {
+    "viewName": "historyQuery",
+    "componentName": "HistoryQuery",
+    "displayName": "History Query",
+    "iconClass": "browse-button-icon",
+    "param": "",
+    "viewParams": "/:type/:payloadEnc/:epochTime",
+    "isExact": false,
+    "onlyRoute": true
+  },
+  {
+    "viewName": "specializedSearch",
+    "componentName": "SpecializedSearch",
+    "displayName": "Specialized Search",
+    "iconClass": "specialized-search-button-icon"
+  }
+]
diff --git a/resources/views/defaultViews_onap.json b/resources/views/defaultViews_onap.json
new file mode 100644
index 0000000..5365c5c
--- /dev/null
+++ b/resources/views/defaultViews_onap.json
@@ -0,0 +1,83 @@
+[
+  {
+    "viewName": "browse",
+    "componentName": "Browse",
+    "displayName": "Browse",
+    "iconClass": "fa-binoculars"
+  },
+  {
+    "viewName": "customDsl",
+    "componentName": "CustomDsl",
+    "displayName": "BYOQ",
+    "iconClass": "fa-flask",
+    "param": "",
+    "viewParams": "",
+    "isExact": true,
+    "onlyRoute": false
+  },
+  {
+    "viewName": "customDsl",
+    "componentName": "CustomDsl",
+    "displayName": "BYOQ",
+    "iconClass": "fa-flask",
+    "param": "",
+    "viewParams": "/:type/:propId/:relArray",
+    "isExact": true,
+    "onlyRoute": true
+  },
+  {
+    "viewName": "customDsl",
+    "componentName": "CustomDsl",
+    "displayName": "BYOQ",
+    "iconClass": "fa-flask",
+    "param": "",
+    "viewParams": "/:type/:propId",
+    "isExact": true,
+    "onlyRoute": true
+  },
+  {
+    "viewName": "customDslBuilder",
+    "componentName": "CustomDslBuilder",
+    "displayName": "BYOQ Builder",
+    "iconClass": "fa-sitemap",
+    "param": "",
+    "viewParams": "/:type/:propId",
+    "isExact": true,
+    "onlyRoute": true
+  },
+  {
+    "viewName": "customDslBuilder",
+    "componentName": "CustomDslBuilder",
+    "displayName": "BYOQ Builder",
+    "iconClass": "fa-sitemap",
+    "param": "",
+    "isExact": true,
+    "onlyRoute": false
+  },
+  {
+    "viewName": "model",
+    "componentName": "Model",
+    "displayName": "Model",
+    "iconClass": "fa-binoculars",
+    "param": "",
+    "viewParams": "/:type",
+    "isExact": true,
+    "onlyRoute": true
+  },
+  {
+    "viewName": "model",
+    "componentName": "Model",
+    "displayName": "Model",
+    "iconClass": "fa-binoculars",
+    "param": "",
+    "viewParams": "/:type/:nodeId/:page",
+    "isExact": false,
+    "onlyRoute": true
+  },
+  {
+    "viewName": "specializedSearch",
+    "componentName": "SpecializedSearch",
+    "displayName": "Specialized Search",
+    "iconClass": "fa-filter"
+  }
+]
diff --git a/sparkyInstallAndRun.bat b/sparkyInstallAndRun.bat
new file mode 100644
index 0000000..d87c158
--- /dev/null
+++ b/sparkyInstallAndRun.bat
@@ -0,0 +1,7 @@
+@echo OFF
+ECHO. ***********************************
+ECHO. ******Installing Sparky************
+call npm install
+ECHO. ******Running Sparky***************
+call gulp build --max-old-space-size=8192
+call gulp --max-old-space-size=8192
diff --git a/sparkyRun.bat b/sparkyRun.bat
new file mode 100644
index 0000000..1c09d2c
--- /dev/null
+++ b/sparkyRun.bat
@@ -0,0 +1,4 @@
+@echo OFF
+ECHO. ******Running Sparky******
+call gulp build --max-old-space-size=8192
+call gulp --max-old-space-size=8192
diff --git a/src/app/AppStore.js b/src/app/AppStore.js
index 842b683..856ffca 100644
--- a/src/app/AppStore.js
+++ b/src/app/AppStore.js
@@ -28,6 +28,7 @@ import VnfSearchReducer from './vnfSearch/VnfSearchReducer.js';
 import GlobalInlineMessageBarReducer from 'app/globalInlineMessageBar/GlobalInlineMessageBarReducer.js';
 import ExtensibilityReducer from 'app/extensibility/ExtensibilityReducer.js';
 import ConfigurableViewReducer from 'app/configurableViews/ConfigurableViewReducer.js';
+import ModelReducer from './model/modelSearch/ModelReducer.js';
 
 
 function createCompose() {
@@ -46,8 +47,9 @@ export const storeCreator = (initialState) => createStore(
     vnfSearch: VnfSearchReducer,
     globalInlineMessageBar: GlobalInlineMessageBarReducer,
     extensibility: ExtensibilityReducer,
-    configurableViews: ConfigurableViewReducer
-  }),
+    configurableViews: ConfigurableViewReducer,
+    modelReducer: ModelReducer
+    }),
   initialState,
   createCompose()
 );
diff --git a/src/app/MainScreenHeader.jsx b/src/app/MainScreenHeader.jsx
index 7808d19..14d6bf2 100644
--- a/src/app/MainScreenHeader.jsx
+++ b/src/app/MainScreenHeader.jsx
@@ -25,14 +25,18 @@ import FontAwesome from 'react-fontawesome';
 import {clearFilters} from 'filter-bar-utils';
 import Button from 'react-bootstrap/lib/Button.js';
 import Modal from 'react-bootstrap/lib/Modal.js';
-import GlobalAutoCompleteSearchBar from 'app/globalAutoCompleteSearchBar/GlobalAutoCompleteSearchBar.jsx';
 import {postAnalyticsData, getStoreAnalyticsPayload} from 'app/analytics/AnalyticsActions.js';
 import GlobalInlineMessageBar from 'app/globalInlineMessageBar/GlobalInlineMessageBar.jsx';
 import {getClearGlobalMessageEvent} from 'app/globalInlineMessageBar/GlobalInlineMessageBarActions.js';
 import {externalUrlRequest, externalMessageRequest, getSubscriptionPayload} from 'app/contextHandler/ContextHandlerActions.js';
 import { getConfigurableViewConfigs } from 'app/configurableViews/ConfigurableViewActions.js';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+import axios from 'axios';
+import {BASE_URL} from 'app/networking/NetworkConstants.js';
+
 import {
-  filterBarActionTypes
+  filterBarActionTypes,
+  ENVIRONMENT
 } from 'utils/GlobalConstants.js';
 
 import {
@@ -43,8 +47,8 @@ import {
 import {
   AAI_TOP_LEFT_HEADER,
   AAI_HTML_TITLE,
-  MENU_ITEM_TIER_SUPPORT,
-  MENU_ITEM_VNF_SEARCH
+  AAI_APERTURE_SERVICE,
+  AAI_LOADTEMPLATE_MAX_COUNT
 } from './MainScreenWrapperConstants.js';
 
 import {
@@ -55,10 +59,13 @@ import {
 
 import {clearSuggestionsTextField} from 'app/globalAutoCompleteSearchBar/GlobalAutoCompleteSearchBarActions.js';
 import {changeUrlAddress} from 'utils/Routes.js';
-import extensibleViews from 'resources/views/extensibleViews.json';
+import defaultViews from 'resources/views/defaultViews.json';
+import defaultViews_onap from 'resources/views/defaultViews_onap.json';
 import {getPersonalizationDetails} from 'app/personlaization/PersonalizationActions.js';
 import {isEmpty} from 'lodash';
 
+let INVLIST = GlobalExtConstants.INVLIST;
+
 const mapStateToProps = ({mainWrapper, configurableViews}) => {
   let {
     showMenu = false,
@@ -68,7 +75,9 @@ const mapStateToProps = ({mainWrapper, configurableViews}) => {
     subscriptionPayload = {},
     subscriptionEnabled = false,
     aaiTopLeftPersonalizedHeader = AAI_TOP_LEFT_HEADER,
-    aaiPersonalizedHtmlDocumentTitle = AAI_HTML_TITLE
+    aaiPersonalizedHtmlDocumentTitle = AAI_HTML_TITLE,
+    aaiPersonalizedApertureService = AAI_APERTURE_SERVICE,
+    aaiPersonalizedLoadTemplateMaxCount = AAI_LOADTEMPLATE_MAX_COUNT
   } = mainWrapper;
 
   let {
@@ -84,7 +93,9 @@ const mapStateToProps = ({mainWrapper, configurableViews}) => {
     subscriptionEnabled,
     configurableViewsConfig,
     aaiTopLeftPersonalizedHeader,
-    aaiPersonalizedHtmlDocumentTitle
+    aaiPersonalizedHtmlDocumentTitle,
+    aaiPersonalizedApertureService,
+    aaiPersonalizedLoadTemplateMaxCount
   };
 };
 
@@ -130,7 +141,9 @@ class MainScreenHeader extends Component {
     secondaryTitle: PropTypes.string,
     subscriptionPayload: PropTypes.object,
     aaiTopLeftPersonalizedHeader: PropTypes.string,
-    aaiPersonalizedHtmlDocumentTitle: PropTypes.string
+    aaiPersonalizedHtmlDocumentTitle: PropTypes.string,
+    aaiPersonalizedApertureService: PropTypes.bool,
+    aaiPersonalizedLoadTemplateMaxCount: PropTypes.string
   };
 
   navigationLinkAndCurrentPathMatch(location, to) {
@@ -168,17 +181,67 @@ class MainScreenHeader extends Component {
       this.isValidExternalURL(this.props.match.params.externalUrl)) {
       this.props.onExternalUrlRequest(this.props.match.params.externalUrl);
     }
+    sessionStorage.setItem(ENVIRONMENT + 'ENABLE_ANALYSIS', !INVLIST.IS_ONAP);
+    var portalInfoPath = BASE_URL + '/portal/info';
+    //portalInfoPath = 'https://localhost:8000/portal/info';
+    axios.get(portalInfoPath).then(res => {
+      console.log('res:' + res.data);
+      var roles = [];
+      if(res.status === 200){
+        if(res.data.status && (res.data.status !== '200')){
+          this.setDefaultCredentials(res.data);
+        }else{
+          sessionStorage.setItem(ENVIRONMENT + 'userId', res.data.attuid);
+          for(var i = 0; i < res.data.role.length; i++){
+            roles.push(res.data.role[i].name);
+          }
+          sessionStorage.setItem(ENVIRONMENT + 'roles', roles);
+        }
+      }else{
+        this.setDefaultCredentials(res.data);
+      }
+    }, error=>{
+      this.setDefaultCredentials(error);
+    }).catch(error => {
+      this.setDefaultCredentials(error);
+    });
+  }
+
+  setDefaultCredentials = (error) =>{
+    console.log('MainScreenHeader.jsx :: Issue retrieving portal info from sparky backend, setting default, details - ' + JSON.stringify(error));
+    sessionStorage.setItem(ENVIRONMENT + 'userId', 'default_uid');
+    var roles = ['ui_view'];
+    sessionStorage.setItem(ENVIRONMENT + 'roles', roles);
   }
 
   componentWillReceiveProps(nextProps) {
     if(!isEmpty(nextProps.aaiPersonalizedHtmlDocumentTitle)) {
-      if(!sessionStorage.getItem('PAGE_TITLE') || sessionStorage.getItem('PAGE_TITLE') !== nextProps.aaiPersonalizedHtmlDocumentTitle) {
-        sessionStorage.setItem('PAGE_TITLE', nextProps.aaiPersonalizedHtmlDocumentTitle);
+      if(!sessionStorage.getItem(ENVIRONMENT + 'PAGE_TITLE') || sessionStorage.getItem(ENVIRONMENT + 'PAGE_TITLE') !== nextProps.aaiPersonalizedHtmlDocumentTitle) {
+        sessionStorage.setItem(ENVIRONMENT + 'PAGE_TITLE', nextProps.aaiPersonalizedHtmlDocumentTitle);
       }
       document.title = nextProps.aaiPersonalizedHtmlDocumentTitle;
     } else {
       document.title = AAI_HTML_TITLE;
     }
+    //Added for APERTURE Service Enable/Disable
+    if(!sessionStorage.getItem(ENVIRONMENT + 'APERTURE_SERVICE') || JSON.parse(sessionStorage.getItem(ENVIRONMENT + 'APERTURE_SERVICE')) !== nextProps.aaiPersonalizedApertureService) {
+      if(JSON.parse(sessionStorage.getItem(ENVIRONMENT + 'APERTURE_SERVICE')) !== nextProps.aaiPersonalizedApertureService){
+        sessionStorage.setItem(ENVIRONMENT + 'APERTURE_SERVICE', Boolean(nextProps.aaiPersonalizedApertureService));
+        if(nextProps.aaiPersonalizedApertureService){
+          sessionStorage.setItem(ENVIRONMENT + 'ENABLE_ANALYSIS', true);
+        }else{
+          sessionStorage.setItem(ENVIRONMENT + 'ENABLE_ANALYSIS', false);
+        }
+      }else{
+        sessionStorage.setItem(ENVIRONMENT + 'APERTURE_SERVICE', Boolean(nextProps.aaiPersonalizedApertureService));
+      }     
+    }
+    if(!sessionStorage.getItem(ENVIRONMENT + 'APERTURE_SERVICE')){
+      sessionStorage.setItem(ENVIRONMENT + 'ENABLE_ANALYSIS', false);
+    }
+    if(!sessionStorage.getItem(ENVIRONMENT + 'LOADTEMPLATE_MAX_COUNT') || sessionStorage.getItem(ENVIRONMENT + 'LOADTEMPLATE_MAX_COUNT') !== nextProps.aaiPersonalizedLoadTemplateMaxCount) {
+      sessionStorage.setItem(ENVIRONMENT + 'LOADTEMPLATE_MAX_COUNT', nextProps.aaiPersonalizedLoadTemplateMaxCount);
+    }
     if (this.props.location &&
       this.props.location.pathname !==
       nextProps.location.pathname) {
@@ -295,33 +358,24 @@ class MainScreenHeader extends Component {
       )}/>
     );
 
-    // add Tier Support view
-    menuOptions.push(
-      <MenuItem key='schemaMenu' to='/schema' label={MENU_ITEM_TIER_SUPPORT}
-                iconClass='button-icon view-inspect-button-icon'/>
-    );
-
-    // add VNF view
-    menuOptions.push(
-      <MenuItem key='vnfSearchMenu'
-                to='/vnfSearch'
-                label={MENU_ITEM_VNF_SEARCH}
-                iconClass='button-icon vnf-search-button-icon'/>
-    );
+    let dv = defaultViews;
+    if(INVLIST.IS_ONAP){
+        dv = defaultViews_onap;
+    }
 
-    // add all custom view menu options
-    for (let view in extensibleViews) {
+    // add all default view menu options
+    for (let view in dv) {
       let shouldDisplayIcon = false;
-      if(extensibleViews[view]['onlyRoute'] === undefined){
+      if(dv[view]['onlyRoute'] === undefined){
         shouldDisplayIcon = true;
-      } else if(extensibleViews[view]['onlyRoute'] === false){
+      } else if(dv[view]['onlyRoute'] === false){
         shouldDisplayIcon = true;
       }
       if(shouldDisplayIcon === true){
         menuOptions.push(
-          <MenuItem key={extensibleViews[view]['viewName'] + 'Menu'} to={'/' + extensibleViews[view]['viewName']}
-                    label={extensibleViews[view]['displayName']}
-                    iconClass={'button-icon ' + extensibleViews[view]['iconClass']}/>
+          <MenuItem key={dv[view]['viewName'] + 'Menu'} to={'/' + dv[view]['viewName']}
+                    label={dv[view]['displayName']}
+                    iconClass={'button-icon font-awesome-icon fa ' + dv[view]['iconClass']}/>
         );
       }
     }
@@ -357,7 +411,6 @@ class MainScreenHeader extends Component {
             </Modal.Body>
           </Modal>
           <span className='application-title'>{aaiTopLeftPersonalizedHeader}</span>
-          <GlobalAutoCompleteSearchBar history={this.props.history}/>
         </div>
         <GlobalInlineMessageBar />
         <div className={secondaryTitleClass}>
diff --git a/src/app/MainScreenWrapper.jsx b/src/app/MainScreenWrapper.jsx
index 3348494..5a5209d 100644
--- a/src/app/MainScreenWrapper.jsx
+++ b/src/app/MainScreenWrapper.jsx
@@ -20,7 +20,7 @@
  */
 import React, {Component} from 'react';
 import {connect} from 'react-redux';
-import * as Extensibility from './extensibility/index.js';
+import * as Module from './module/index.js';
 import TierSupport from './tierSupport/TierSupport.jsx';
 import VnfSearch from './vnfSearch/VnfSearch.jsx';
 import MainScreenHeader from './MainScreenHeader.jsx';
@@ -45,7 +45,7 @@ import {
   extensibleViewMessageCallback
 } from './MainScreenWrapperActionHelper.js';
 
-import extensibleViews from 'resources/views/extensibleViews.json';
+import defaultViews from 'resources/views/defaultViews.json';
 import customComponentConfig from 'resources/views/customComponents.json';
 import { newCustomComponentsEvent } from 'app/configurableViews/ConfigurableViewActions.js';
 import {
@@ -146,10 +146,10 @@ class MainScreenWrapper extends Component {
     } = this.props;
 
     let customViewList = [];
-    extensibleViews.forEach(function(view,key) {
+    defaultViews.forEach(function(view,key) {
 
       let path = '', extKey = '';
-      if(isEmpty(extensibleViews[key]['viewParams'])){
+      if(isEmpty(defaultViews[key]['viewParams'])){
         path = '/' + view.viewName + '/:extensibleViewParams?';
         extKey = view.viewName + 'Route';
       } else {
@@ -159,12 +159,12 @@ class MainScreenWrapper extends Component {
 
       var renderComponent = (props) => {
         let viewParams = {};
-        if(isEmpty(extensibleViews[key]['viewParams']) && props.match.params.extensibleViewParams !== undefined) {
+        if(isEmpty(defaultViews[key]['viewParams']) && props.match.params.extensibleViewParams !== undefined) {
           viewParams = decryptParamsForView(props.match.params.extensibleViewParams);
         }
 
-        if (Extensibility.default.hasOwnProperty(view.componentName)) {
-          let Component = Extensibility.default[view.componentName];
+        if (Module.default.hasOwnProperty(view.componentName)) {
+          let Component = Module.default[view.componentName];
           return (
             <Component
               {...props}
@@ -189,7 +189,7 @@ class MainScreenWrapper extends Component {
           );
         }
       };
-      if(isEmpty(extensibleViews[key]['isExact']) && !extensibleViews[key]['isExact']){
+      if(isEmpty(defaultViews[key]['isExact']) && !defaultViews[key]['isExact']){
         customViewList.push(
           <Route key={extKey} path={path} render={renderComponent}/>
         );
@@ -205,7 +205,7 @@ class MainScreenWrapper extends Component {
 
     return (
       <Router>
-        <div className='main-app-container'>
+        <div className='main-app-container' id='main-app-container'>
           <Switch>
             <Redirect from='/' exact to='/schema'/>
           </Switch>
diff --git a/src/app/MainScreenWrapperConstants.js b/src/app/MainScreenWrapperConstants.js
index a3748d0..f3baf28 100644
--- a/src/app/MainScreenWrapperConstants.js
+++ b/src/app/MainScreenWrapperConstants.js
@@ -39,3 +39,5 @@ export const AAI_TOP_LEFT_HEADER = 'A&AI';
 export const AAI_HTML_TITLE = 'A&AI';
 export const MENU_ITEM_TIER_SUPPORT = 'View & Inspect';
 export const MENU_ITEM_VNF_SEARCH = 'VNFs';
+export const AAI_APERTURE_SERVICE = false;
+export const AAI_LOADTEMPLATE_MAX_COUNT = 10;
diff --git a/src/app/MainScreenWrapperReducer.js b/src/app/MainScreenWrapperReducer.js
index 1875163..1301032 100644
--- a/src/app/MainScreenWrapperReducer.js
+++ b/src/app/MainScreenWrapperReducer.js
@@ -83,7 +83,9 @@ export default (state = {}, action) => {
       return {
         ...state,
         aaiTopLeftPersonalizedHeader: action.data.topLeftHeader,
-        aaiPersonalizedHtmlDocumentTitle: action.data.htmlDocumentTitle
+        aaiPersonalizedHtmlDocumentTitle: action.data.htmlDocumentTitle,
+        aaiPersonalizedApertureService: action.data.apertureService,
+        aaiPersonalizedLoadTemplateMaxCount: action.data.loadTemplateMaxCount
       };
   }
   return state;
diff --git a/src/app/assets/configuration/aai/CustomQueryList.json b/src/app/assets/configuration/aai/CustomQueryList.json
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/src/app/assets/configuration/aai/CustomQueryList.json
@@ -0,0 +1 @@
+{}
diff --git a/src/app/assets/configuration/aai/InvList.json b/src/app/assets/configuration/aai/InvList.json
new file mode 100644
index 0000000..d0d0619
--- /dev/null
+++ b/src/app/assets/configuration/aai/InvList.json
@@ -0,0 +1,364 @@
+{
+    "NODESERVER": false,
+    "PROXY": "proxy",
+    "PREFIX": "aai",
+    "VERSION": "v23",
+    "APERTURE": "aperture",
+    "APERTURE_SERVICENAME": "inquiry",
+    "IS_ONAP": true,
+    "USERGUIDE_URL": "",
+    "useStubs": false,
+    "TABULAR": "tabular",
+    "TABULARVERSION": "v1",
+    "animationIntervalMs": 5000,
+    "INVENTORYLIST": {               
+        "AVAILABILITYZONES": {
+            "apiPath": "nodes/availability-zones",
+            "display": "Availability Zones",
+            "modelPath": "availabilityZones",
+            "icon": "browse-fa fa fa-globe"
+        },       
+        "ACTIVITIES": {
+            "apiPath": "nodes/activities",
+            "display": "Activities",
+            "modelPath": "activities",
+            "icon": "browse-fa fa fa-server"
+        }, 
+        "AGGREGATEROUTES": {
+	        "apiPath": "nodes/aggregate-route",
+	        "display": "Aggregate Routes",
+	        "modelPath": "aggregateRoutes",
+            "icon": "browse-fa fa fa-link"
+        },
+    	"AUTONOMOUSSYSTEMS": {
+            "apiPath": "nodes/autonomous-systems",
+            "display": "Autonomous Systems",
+            "modelPath": "autonomousSystems",
+            "icon": "browse-fa fa fa-desktop"
+        },  
+        "BGPGROUPS": {
+            "apiPath": "nodes/bgp-groups",
+            "display": "Bgp Groups",
+            "modelPath": "bgpGroups",
+            "icon": "browse-fa fa fa-server"
+        },
+        "BGPNEIGHBORS": {
+            "apiPath": "nodes/bgp-neighbors",
+            "display": "Bgp Neighbors",
+            "modelPath": "bgpNeighbors",
+            "icon": "browse-fa fa fa-server"
+        },      
+        "CABLES": {
+            "apiPath": "nodes/cables",
+            "display": "Cables",
+            "modelPath": "cables",
+            "icon": "browse-fa fa fa-link"
+        },
+        "COMPLEXES": {
+            "apiPath": "nodes/complexes",
+            "display": "Complexes",
+            "modelPath": "complexes",
+            "icon": "browse-fa fa fa-building"
+        },
+        "CONFIGURATIONS": {
+            "apiPath": "nodes/configurations",
+            "display": "Configurations",
+            "modelPath": "configurations",
+            "icon": "browse-fa fa fa-list-alt"
+        },
+        "CLOUDREGIONS": {
+            "apiPath": "nodes/cloud-regions",
+            "display": "Cloud Regions",
+            "modelPath": "cloudRegions",
+            "icon": "browse-fa fa fa-cloud"
+        },
+        "CHASSIES": {
+            "apiPath": "nodes/chassies",
+            "display": "Chassies",
+            "modelPath": "chassies",
+            "icon": "browse-fa fa fa-server"
+        },        
+        "CARDS": {
+            "apiPath": "nodes/cards",
+            "display": "Cards",
+            "modelPath": "cards",
+            "icon": "browse-fa fa fa-hdd-o"
+        },        
+        "CONTACTS": {
+            "apiPath": "nodes/contacts",
+            "display": "Contacts",
+            "modelPath": "contacts",
+            "icon": "browse-fa fa fa-group"
+        },
+        "CUSTOMERS": {
+            "apiPath": "nodes/customers",
+            "display": "Customers",
+            "modelPath": "customers",
+            "icon": "browse-fa fa fa-group"
+        },
+	    "ENDPOINTS": {
+            "apiPath": "nodes/endpoints",
+            "display": "Endpoints",
+            "modelPath": "endpoints",
+            "icon": "browse-fa fa fa-dot-circle-o"
+        },        
+        "GENERICVNFS": {
+            "apiPath": "nodes/generic-vnfs",
+            "display": "Generic Virtual Network Functions",
+            "modelPath": "genericVnfs",
+            "icon": "browse-fa fa fa-server"
+        },
+        "GEOREGIONS": {
+            "apiPath": "nodes/geo-region",
+            "display": "GeoRegions",
+            "modelPath": "geoRegions",
+            "icon": "browse-fa fa fa-globe"
+        },        
+	    "HARDWARECATALOGITEMS": {
+            "apiPath": "nodes/hardware-catalog-items",
+            "display": "Hardware Catalog Items",
+            "modelPath": "hardwareCatalogItems",
+            "icon": "browse-fa fa fa-server"
+        },
+        "HOSTAGGREGATES": {
+            "apiPath": "nodes/host-aggregates",
+            "display": "Host-Aggregates",
+            "modelPath": "hostAggregates",
+            "icon": "browse-fa fa fa-cubes"
+        },
+	    "INSTANCEGROUPS": {
+            "apiPath": "nodes/instance-groups",
+            "display": "Instance Groups",
+            "modelPath": "instanceGroups",
+            "icon": "browse-fa fa fa-cubes"
+        },        
+        "LAGINTERFACES": {
+            "apiPath": "nodes/lag-interfaces",
+            "display": "Lag-Interfaces",
+            "modelPath": "lagInterfaces",
+            "icon": "browse-fa fa fa-hdd-o"
+        },         
+        "LAGLINKS": {
+            "apiPath": "network/lag-links",
+            "display": "Line Aggregation Links",
+            "modelPath": "lagLinks",
+            "icon": "browse-fa fa fa-exchange"
+        },        
+        "LINESOFBUSINESS": {
+            "apiPath": "nodes/lines-of-business",
+            "display": "Lines of Business",
+            "modelPath": "linesOfBusiness",
+            "icon": "browse-fa fa fa-server"
+        },
+        "LINTERFACES": {
+            "apiPath": "nodes/l-interfaces",
+            "display": "L-Interfaces",
+            "modelPath": "lInterfaces",
+            "icon": "browse-fa fa fa-hdd-o"
+        },
+        "LOGICALLINKS": {
+            "apiPath": "nodes/logical-links",
+            "display": "Logical Links",
+            "modelPath": "logicalLinks",
+            "icon": "browse-fa fa fa-exchange"
+        },        
+        "L3NETWORKS": {
+            "apiPath": "nodes/l3-networks",
+            "display": "L3 Networks",
+            "modelPath": "l3Networks",
+            "icon": "browse-fa fa fa-server"
+        },        
+        "MAPPINGS": {
+            "apiPath": "nodes/mappings",
+            "display": "Mappings",
+            "modelPath": "mappings",
+            "icon": "browse-fa fa fa-code-fork"
+        },       
+        "OBJECTGROUPS": {
+            "apiPath": "nodes/object-groups",
+            "display": "Object Groups",
+            "modelPath": "objectGroups",
+            "icon": "browse-fa fa fa-cubes"
+        },        
+        "OWNINGENTITIES": {
+            "apiPath": "nodes/owning-entities",
+            "display": "Owning Entities",
+            "modelPath": "owningEntities",
+            "icon": "browse-fa fa fa-sitemap"
+        },        
+        "PDUS": {
+            "apiPath": "nodes/pdus",
+            "display": "Power Distribution Units",
+            "modelPath": "pdus",
+            "icon": "browse-fa fa fa-flash"
+        },        
+        "PHYSICALLINKS": {
+            "apiPath": "nodes/physical-links",
+            "display": "Physical Links",
+            "modelPath": "physicalLinks",
+            "icon": "browse-fa fa fa-exchange"
+        },
+        "PINTERFACES": {
+            "apiPath": "nodes/p-interfaces",
+            "display": "Physical Interface",
+            "modelPath": "pInterfaces",
+            "icon": "browse-fa fa fa-hdd-o"
+        },
+        "PLUGGABLES": {
+            "apiPath": "nodes/pluggables",
+            "display": "Pluggables",
+            "modelPath": "pluggables",
+            "icon": "browse-fa fa fa-plug"
+        },        
+        "PLATFORMS": {
+            "apiPath": "business/platforms",
+            "display": "Platforms",
+            "modelPath": "platforms",
+            "icon": "browse-fa fa fa-connectdevelop"
+        },
+        "PNFS": {
+            "apiPath": "nodes/pnfs",
+            "display": "Physical Network Functions",
+            "modelPath": "pnfs",
+            "icon": "browse-fa fa fa-server"
+        },     
+        "POLICIES": {
+            "apiPath": "nodes/policies",
+            "display": "Policies",
+            "modelPath": "policies",
+            "icon": "browse-fa fa fa-list-alt"
+        },
+        "PORTS": {
+            "apiPath": "nodes/ports",
+            "display": "Ports",
+            "modelPath": "ports",
+            "icon": "browse-fa fa fa-dot-circle-o"
+        },	
+        "PROJECTS": {
+            "apiPath": "nodes/projects",
+            "display": "Projects",
+            "modelPath": "projects",
+            "icon": "browse-fa fa fa-cubes"
+        },       
+        "PROFILES": {
+            "apiPath": "nodes/profiles",
+            "display": "Profiles",
+            "modelPath": "profiles",
+            "icon": "browse-fa fa fa-list-alt"
+        },       
+        "PSERVERS": {
+            "apiPath": "nodes/pservers",
+            "display": "Physical Servers",
+            "modelPath": "pservers",
+            "icon": "browse-fa fa fa-server"
+        },
+        "RACKS": {
+            "apiPath": "nodes/racks",
+            "display": "Racks",
+            "modelPath": "racks",
+            "icon": "browse-fa fa fa-server"
+        },        
+        "RULES": {
+            "apiPath": "nodes/rules",
+            "display": "Rules",
+            "modelPath": "rules",
+            "icon": "browse-fa fa fa-list-ol"
+        },  
+        "ROUTETARGETS": {
+            "apiPath": "nodes/route-targets",
+            "display": "Route Targets",
+            "modelPath": "routeTargets",
+            "icon": "browse-fa fa fa-server"
+        },       
+        "SERVICESUBSCRIPTIONS": {
+            "apiPath": "nodes/service-subscriptions",
+            "display": "Service Subscriptions",
+            "modelPath": "serviceSubscriptions",
+            "icon": "browse-fa fa fa-newspaper-o"
+        },
+        "SERVICEINSTANCES": {
+            "apiPath": "nodes/service-instances",
+            "display": "Service Instances",
+            "modelPath": "serviceInstances",
+            "icon": "browse-fa fa fa-list-alt"
+        },        
+        "SUBNETS": {
+            "apiPath": "nodes/subnets",
+            "display": "Subnets",
+            "modelPath": "subnets",
+            "icon": "browse-fa fa fa-share-alt"
+        },
+        "TENANTS": {
+            "apiPath": "nodes/tenants",
+            "display": "Tenants",
+            "modelPath": "tenants",
+            "icon": "browse-fa fa fa-cloud"
+        },       	    
+        "VCES": {
+            "apiPath": "network/vces",
+            "display": "Virtual Customer Edge Routers",
+            "modelPath": "vces",
+            "icon": "browse-fa fa fa-cloud"
+        },          
+        "VFMODULES": {
+            "apiPath": "nodes/vf-modules",
+            "display": "Virtual Function Modules",
+            "modelPath": "vfModules",
+            "icon": "browse-fa fa fa-cloud"
+        },       
+        "VIRTUALDATACENTERS": {
+            "apiPath": "cloud-infrastructure/virtual-data-centers",
+            "display": "Virtual Data Centers",
+            "modelPath": "virtualDataCenters",
+            "icon": "browse-fa fa fa-cloud"
+        },
+        "VLANTAGS": {
+            "apiPath": "nodes/vlan-tags",
+            "display": "Vlan Tags",
+            "modelPath": "vlanTags",
+            "icon": "browse-fa fa fa-server"
+        },
+        "VLANRANGES": {
+            "apiPath": "nodes/vlan-ranges",
+            "display": "Vlan Ranges",
+            "modelPath": "vlanRanges",
+            "icon": "browse-fa fa fa-server"
+        },
+        "VNFCS": {
+            "apiPath": "network/vnfcs",
+            "display": "Virtual Network Function Components",
+            "modelPath": "vnfcs",
+            "icon": "browse-fa fa fa-server"
+        },
+        "VPLSPES": {
+            "apiPath": "network/vpls-pes",
+            "display": "VPLS-PES",
+            "modelPath": "vplsPes",
+            "icon": "browse-fa fa fa-server"
+        },
+	    "VPNBINDINGS": {
+            "apiPath": "nodes/vpn-bindings",
+            "display": "VPN Bindings",
+            "modelPath": "vpnBindings",
+            "icon": "browse-fa fa fa-exchange"
+        },
+        "VSERVERS": {
+            "apiPath": "nodes/vservers",
+            "display": "Virtual Servers",
+            "modelPath": "vservers",
+            "icon": "browse-fa fa fa-server"
+        },        
+        "VRFS": {
+            "apiPath": "nodes/vrfs",
+            "display": "VRFs",
+            "modelPath": "vrfs",
+            "icon": "browse-fa fa fa-server"
+        }, 
+        "ZONES": {
+            "apiPath": "nodes/zones",
+            "display": "Zones",
+            "modelPath": "zones",
+            "icon": "browse-fa fa fa-map-marker"
+        }
+    }
+}
diff --git a/src/app/assets/configuration/aai/dbedgeRules.json b/src/app/assets/configuration/aai/dbedgeRules.json
new file mode 100644
index 0000000..3b7b908
--- /dev/null
+++ b/src/app/assets/configuration/aai/dbedgeRules.json
@@ -0,0 +1,6036 @@
+{
+	"rules": [
+		{
+			"from": "allotted-resource",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.PartOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "allotted-resource",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "allotted-resource",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.PartOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "allotted-resource",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "allotted-resource",
+			"to": "network-policy",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "allotted-resource",
+			"to": "vlan",
+			"label": "org.onap.relationships.inventory.PartOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "allotted-resource",
+			"to": "vpn-binding",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "tunnel-xconnect",
+			"to": "allotted-resource",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "availability-zone",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "availability-zone",
+			"to": "service-capability",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "availability-zone",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "cloud-region",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "cloud-region",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "cloud-region",
+			"to": "zone",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "dvs-switch",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "flavor",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "group-assignment",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "image",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "oam-network",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "snapshot",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "tenant",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vip-ipv4-address-list",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vip-ipv6-address-list",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "volume-group",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "line-of-business",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "complex",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "ctag-pool",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "configuration",
+			"to": "allotted-resource",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "configuration",
+			"to": "logical-link",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "metadatum",
+			"to": "configuration",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "connector",
+			"to": "virtual-data-center",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "metadatum",
+			"to": "connector",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "element-choice-set",
+			"to": "constrained-element-set",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "ctag-pool",
+			"to": "availability-zone",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-subscription",
+			"to": "customer",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"service-subscription BelongsTo customer"
+		},
+		{
+			"from": "dvs-switch",
+			"to": "availability-zone",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "model-element",
+			"to": "element-choice-set",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "entitlement",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "availability-zone",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "configuration",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "ctag-pool",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "ipsec-configuration",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "pnf",
+			"label": "tosca.relationships.HostedOn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "pserver",
+			"label": "tosca.relationships.HostedOn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "tenant",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vnfc",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "vnf-image",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "volume-group",
+			"label": "org.onap.relationships.inventory.DependsOn",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "vserver",
+			"label": "tosca.relationships.HostedOn",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "lag-interface",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "license",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l-interface",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "network-profile",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "site-pair-set",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vf-module",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "pserver",
+			"to": "group-assignment",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "tenant",
+			"to": "group-assignment",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "metadatum",
+			"to": "image",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "instance-group",
+			"to": "model",
+			"label": "org.onap.relationships.inventory.Targets",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vig-server",
+			"to": "ipsec-configuration",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv4-address-list",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.network.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv4-address-list",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.network.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv4-address-list",
+			"to": "subnet",
+			"label": "org.onap.relationships.inventory.network.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv6-address-list",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.network.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv6-address-list",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.network.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv6-address-list",
+			"to": "subnet",
+			"label": "org.onap.relationships.inventory.network.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "ctag-assignment",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-network",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-network",
+			"to": "network-policy",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-network",
+			"to": "route-table-reference",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-network",
+			"to": "vpn-binding",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "segmentation-assignment",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "subnet",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "lag-interface",
+			"to": "lag-link",
+			"label": "tosca.relationships.network.LinksTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "lag-interface",
+			"to": "logical-link",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "lag-interface",
+			"to": "p-interface",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l-interface",
+			"to": "lag-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "lag-interface",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":""
+		},
+		{
+			"from": "line-of-business",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv4-address-list",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv6-address-list",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l-interface",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l-interface",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l-interface",
+			"to": "logical-link",
+			"label": "tosca.relationships.network.LinksTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.Source",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.Destination",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":""
+		},
+		{
+			"from": "sriov-vf",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vlan",
+			"to": "l-interface",
+			"label": "tosca.relationships.network.LinksTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BridgedTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "lag-link",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "logical-link",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "pnf",
+			"label": "org.onap.relationships.inventory.BridgedTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "pserver",
+			"label": "org.onap.relationships.inventory.BridgedTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "vpn-binding",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "model-ver",
+			"to": "model",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "constrained-element-set",
+			"to": "model-constraint",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "constrained-element-set",
+			"to": "model-element",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "model-constraint",
+			"to": "model-element",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "model-element",
+			"to": "model-element",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "model-element",
+			"to": "model-ver",
+			"label": "org.onap.relationships.inventory.IsA",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "metadatum",
+			"to": "model-ver",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "model-element",
+			"to": "model-ver",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "named-query",
+			"to": "model",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "named-query-element",
+			"to": "named-query",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "named-query-element",
+			"to": "model",
+			"label": "org.onap.relationships.inventory.IsA",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "named-query-element",
+			"to": "named-query-element",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "property-constraint",
+			"to": "named-query-element",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "related-lookup",
+			"to": "named-query-element",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l-interface",
+			"to": "newvce",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "oam-network",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "oam-network",
+			"to": "service-capability",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "operational-environment",
+			"to": "operational-environment",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "owning-entity",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "owning-entity",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":"service-instance Uses an owning-entity"
+		},
+		{
+			"from": "l-interface",
+			"to": "p-interface",
+			"label": "tosca.relationships.network.BindsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "p-interface",
+			"to": "logical-link",
+			"label": "tosca.relationships.network.LinksTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "p-interface",
+			"to": "physical-link",
+			"label": "tosca.relationships.network.LinksTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "sriov-pf",
+			"to": "p-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "platform",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "lag-interface",
+			"to": "pnf",
+			"label": "tosca.relationships.network.BindsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "p-interface",
+			"to": "pnf",
+			"label": "tosca.relationships.network.BindsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "pnf",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "pnf",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "pnf",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.Primary",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":""
+		},
+		{
+			"from": "pnf",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.Secondary",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":""
+		},
+		{
+			"from": "pnf",
+			"to": "zone",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "cvlan-tag",
+			"to": "port-group",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "project",
+			"to": "service-instance",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "lag-interface",
+			"to": "pserver",
+			"label": "tosca.relationships.network.BindsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "p-interface",
+			"to": "pserver",
+			"label": "tosca.relationships.network.BindsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "pserver",
+			"to": "availability-zone",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "pserver",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "pserver",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "pserver",
+			"to": "zone",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "site-pair",
+			"to": "routing-instance",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "allotted-resource",
+			"to": "service-instance",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "metadatum",
+			"to": "service-instance",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "allotted-resource",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA":"NONE",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":"MSO creates this edge on VNF Group Service creation"
+		},
+		{
+			"from": "service-instance",
+			"to": "configuration",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "connector",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "ctag-assignment",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "cvlan-tag",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "logical-link",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "pnf",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "service-instance",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "vlan",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "zone",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "service-subscription",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"service-instance BelongsTo service-subscription"
+		},
+		{
+			"from": "class-of-service",
+			"to": "site-pair",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "routing-instance",
+			"to": "site-pair-set",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "sriov-vf",
+			"to": "sriov-pf",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "host-route",
+			"to": "subnet",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-subscription",
+			"to": "tenant",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "tenant",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vserver",
+			"to": "tenant",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "entitlement",
+			"to": "vce",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "license",
+			"to": "vce",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "port-group",
+			"to": "vce",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "vce",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vce",
+			"to": "availability-zone",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vce",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vce",
+			"to": "vserver",
+			"label": "tosca.relationships.HostedOn",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vf-module",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.DependsOn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vf-module",
+			"to": "vnfc",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vf-module",
+			"to": "volume-group",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vip-ipv4-address-list",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vip-ipv4-address-list",
+			"to": "subnet",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vip-ipv6-address-list",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vip-ipv6-address-list",
+			"to": "subnet",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "virtual-data-center",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "virtual-data-center",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv4-address-list",
+			"to": "vlan",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv6-address-list",
+			"to": "vlan",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vlan",
+			"to": "logical-link",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vlan",
+			"to": "multicast-configuration",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv4-address-list",
+			"to": "vnfc",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv6-address-list",
+			"to": "vnfc",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vnfc",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vnfc",
+			"to": "vip-ipv4-address-list",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vnfc",
+			"to": "vip-ipv6-address-list",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "tenant",
+			"to": "volume-group",
+			"label": "org.onap.relationships.inventory.DependsOn",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "volume-group",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "lag-interface",
+			"to": "vpls-pe",
+			"label": "tosca.relationships.network.BindsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "p-interface",
+			"to": "vpls-pe",
+			"label": "tosca.relationships.network.BindsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vpls-pe",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vpls-pe",
+			"to": "ctag-pool",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "route-target",
+			"to": "vpn-binding",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l-interface",
+			"to": "vserver",
+			"label": "tosca.relationships.network.BindsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vf-module",
+			"to": "vserver",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vnfc",
+			"to": "vserver",
+			"label": "tosca.relationships.HostedOn",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vserver",
+			"to": "flavor",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vserver",
+			"to": "image",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vserver",
+			"to": "pserver",
+			"label": "tosca.relationships.HostedOn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vserver",
+			"to": "snapshot",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vserver",
+			"to": "volume",
+			"label": "tosca.relationships.AttachesTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "zone",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "configuration",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "configuration",
+			"to": "pnf",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "forwarder",
+			"to": "forwarding-path",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "forwarding-path",
+			"to": "service-instance",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "forwarder",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.ForwardsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "forwarder",
+			"to": "configuration",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "forwarding-path",
+			"to": "configuration",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "forwarder",
+			"to": "lag-interface",
+			"label": "org.onap.relationships.inventory.ForwardsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "evc",
+			"to": "configuration",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "forwarder-evc",
+			"to": "configuration",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "forwarder",
+			"to": "p-interface",
+			"label": "org.onap.relationships.inventory.ForwardsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "nos-server",
+			"label": "tosca.relationships.HostedOn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "nos-server",
+			"to": "pserver",
+			"label": "tosca.relationships.HostedOn",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "nos-server",
+			"to": "tenant",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "configuration",
+			"to": "configuration",
+			"label": "tosca.relationships.network.BindsTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "configuration",
+			"to": "vpn-binding",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "configuration",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.PartOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vpn-binding",
+			"to": "customer",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "configuration",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":""
+		},
+		{
+			"from": "forwarder",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "Points to the generic-vnf(s) involved in this forwarding step."
+		},
+        {
+            "from": "cloud-region",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+         },
+		 {
+			"from": "instance-group",
+			"to": "collection",
+			"label": "org.onap.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		 },
+		 {
+			"from": "service-instance",
+			"to": "collection",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		 },
+		 {
+			"from": "vlan-mapping",
+			"to": "forwarder-evc",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		 },
+         {
+             "from": "allotted-resource",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+         {
+             "from": "configuration",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+         {
+             "from": "connector",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+         {
+             "from": "generic-vnf",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+         {
+             "from": "instance-group",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+         {
+             "from": "l3-network",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+         {
+             "from": "logical-link",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+         {
+             "from": "service-instance",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+         {
+             "from": "vf-module",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+         {
+             "from": "vnfc",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+		{
+			"from": "pnf",
+			"to": "model-ver",
+			"label": "org.onap.relationships.inventory.IsA",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"private": "true"
+		},
+		{
+			"from": "collection",
+			"to": "model-ver",
+			"label": "org.onap.relationships.inventory.IsA",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"private": "true"
+		},
+		{
+			"from": "configuration",
+			"to": "vnfc",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vnfc",
+			"to": "cp",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"cp is child of vnfc"
+		},
+		{
+			"from": "l3-interface-ipv4-address-list",
+			"to": "cp",
+			"label": "org.onap.relationships.inventory.network.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv6-address-list",
+			"to": "cp",
+			"label": "org.onap.relationships.inventory.network.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vip-ipv4-address-list",
+			"to": "cp",
+			"label": "org.onap.relationships.inventory.network.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vip-ipv6-address-list",
+			"to": "cp",
+			"label": "org.onap.relationships.inventory.network.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vlan-tag",
+			"to": "cp",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l-interface",
+			"to": "cp",
+			"label": "tosca.relationships.network.LinksTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-network",
+			"to": "cp",
+			"label": "tosca.relationships.network.LinksTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "line-of-business",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "platform",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-network",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"l3-network uses l3-network"
+		},
+		{
+			"from": "generic-vnf",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.Primary",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.Secondary",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":""
+		},
+		{
+			"from": "instance-group",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":""
+		},
+			{
+			"from": "cloud-region",
+			"to": "network-technology",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+				{
+			"from": "vrf",
+			"to": "pnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A vrf belongs to a pnf."
+		},
+		{
+			"from": "vrf",
+			"to": "vpn-binding",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A vrf uses a vpn-binding."
+		},
+		{
+			"from": "vrf",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A vrf uses many l3-networks"
+		},
+		{
+			"from": "configuration",
+			"to": "vrf",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A Configuration uses VRFs"	
+		},
+		{
+			"from": "vrf",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "route-target",
+			"to": "vrf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "contact",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.supports",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "aggregate-route",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+        },{
+			"from": "configuration",
+			"to": "lag-interface",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},{
+			"from": "configuration",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.PartOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},{
+			"from": "owning-entity",
+			"to": "tenant",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},{
+			"from": "line-of-business",
+			"to": "tenant",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},{
+			"from": "vlan-tag",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A vlan-tag belongs to a vlan-range."
+		},{
+			"from": "l3-network",
+			"to": "vlan-tag",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A l3-network Uses vlan-tag."
+		},{
+            "from": "policy",
+            "to": "vlan-tag",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description":"This edge allows for QOS policy to vlan-tag relationship. For a given policy get all vlan tags as well as for a given vlan-tag get all the policies."
+        },{
+			"from": "l-interface",
+			"to": "vlan-tag",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":"An sub-interface that uses a vlan-tag."
+		},{
+			"from": "vlan-range",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A vlan range belongs to a cloud-region."
+		},{
+			"from": "owning-entity",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"An owning-entity uses a vlan-range."
+		},{
+			"from": "line-of-business",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A line-of uses a vlan-range"
+		},{
+			"from": "ip-address-list",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "l3-interface-ipv6-address-list",
+			"to": "lag-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A IPv6 address associated with a lag-interface."
+		},
+		{
+			"from": "bgp-neighbor",
+			"to": "bgp-group",
+			"label": "org.onap.relationships.inventory.network.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "bgp-neighbor is a member of an bgp-group."
+		},
+		{
+			"from": "policy",
+			"to": "address-family",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A policy applies to an address family."
+		},
+		{
+			"from": "l3-interface-ipv4-address-list",
+			"to": "p-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A IPv4 address associated with a p-interface."
+		},
+		{
+			"from": "pserver",
+			"to": "hw-component",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The hw-component associated to a pserver"
+		},
+		{
+			"from": "pnf",
+			"to": "autonomous-system",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "pnf is located in the autonomous-system."
+		},
+		{
+			"from": "zone",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "network-range",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The network-range is located in a complex"
+		},
+		{
+			"from": "lag-interface",
+			"to": "geo-region",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The lag-interface associated to a geo-region"
+		},
+		{
+			"from": "activity-state",
+			"to": "activity",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "An activity-state is tracks the state of an activity."
+		},
+		{
+			"from": "relationship-rule",
+			"to": "policy",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "Details relationships policy requires."
+		},
+		{
+			"from": "generic-vnf",
+			"to": "bgp-group",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The bgp-group associated to a generic-vnf."
+		},
+		{
+			"from": "mapping",
+			"to": "policy",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The mapping associated to a policy"
+		},
+		{
+			"from": "bgp-group",
+			"to": "pnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A bgp-group  belongs to a pnf."
+		},
+		{
+			"from": "address-family",
+			"to": "bgp-group",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "Address Family belongs to a bgp-group"
+		},
+		{
+			"from": "bgp-group",
+			"to": "autonomous-system",
+			"label": "org.onap.relationships.inventory.Source",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "To node-type is source of bgp-group."
+		},
+		{
+			"from": "bgp-group",
+			"to": "autonomous-system",
+			"label": "org.onap.relationships.inventory.Destination",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "false",
+			"description": "To node-type is destination of bgp-group."
+		},
+		{
+			"from": "profile",
+			"to": "policy",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A profile (set of characteristics) applies to the policy."
+		},
+		{
+			"from": "profile",
+			"to": "vpn-binding",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A profile (set of characteristics) applies to the vpn-binding."
+		},
+		{
+			"from": "sw-component",
+			"to": "profile",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The profile associated to a sw-component"
+		},
+		{
+			"from": "pserver",
+			"to": "sw-component",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The sw-component associated to a pserver"
+		},
+		{
+			"from": "policy",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A policy applies to l3-networks."
+		},
+		{
+			"from": "ip-address-list",
+			"to": "port-list",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "profile",
+			"to": "chassis",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "None",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "The profile (set of characteristics) applies to the chassis."
+		},
+		{
+			"from": "selector-list",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "bgp-neighbor",
+			"to": "vip-ipv6-address-list",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "bgp-neighbor uses To node-type."
+		},
+		{
+			"from": "network-range",
+			"to": "zone",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The network-range is located in a zone"
+		},
+		{
+			"from": "pnf",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "profile",
+			"to": "lag-interface",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A profile (set of characteristics) applies to the lag-interface."
+		},
+		{
+			"from": "bgp-group",
+			"to": "vip-ipv6-address-list",
+			"label": "org.onap.relationships.inventory.Source",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "To node-type is source of bgp-group."
+		},
+		{
+			"from": "bgp-group",
+			"to": "vip-ipv6-address-list",
+			"label": "org.onap.relationships.inventory.Destination",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "false",
+			"description": "To node-type is destination of bgp-group."
+		},
+		{
+			"from": "port-list",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "zone",
+			"to": "service-instance",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description": ""
+		},
+		{
+			"from": "selector-list",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "policy",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The policy applies to an l-interface."
+		},
+		{
+			"from": "activity",
+			"to": "pserver",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The activity applies to a pserver."
+		},
+		{
+			"from": "profile",
+			"to": "hardware-catalog-item",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A set of characteristics of the hardware-catalog-item."
+		},
+		{
+			"from": "pdu",
+			"to": "rack",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A pdu is located in a building (aka complex)."
+		},
+		{
+			"from": "pserver",
+			"to": "policy",
+			"label": "org.onap.relationships.inventory.Implements",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "mapping",
+			"to": "pnf",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The mapping associated to a pnf"
+		},
+		{
+			"from": "bgp-group",
+			"to": "l3-interface-ipv4-address-list",
+			"label": "org.onap.relationships.inventory.Source",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "To node-type is source of bgp-group."
+		},
+		{
+			"from": "bgp-group",
+			"to": "l3-interface-ipv4-address-list",
+			"label": "org.onap.relationships.inventory.Destination",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "false",
+			"description": "To node-type is destination of bgp-group."
+		},
+		{
+			"from": "port",
+			"to": "pluggable",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A port is located in a pluggable."
+		},
+		{
+			"from": "activity",
+			"to": "mapping",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The reservation information associated with a NAT Pool mapping."
+		},
+		{
+			"from": "mapping",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The mapping associated to an object-group"
+		},
+		{
+			"from": "profile",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "ip-address-list",
+			"to": "policy",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "An ip-address-list BelongsTo a policy."
+		},
+		{
+			"from": "rack-unit",
+			"to": "rack",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A rack-unit is located in a rack."
+		},
+		{
+			"from": "pdu",
+			"to": "hardware-catalog-item",
+			"label": "org.onap.relationships.inventory.IsA",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "The pdu is described by the hardware-catalog-item."
+		},
+		{
+			"from": "complex",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "relationship-rule",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "Details relationships endpoint requires"
+		},
+		{
+			"from": "policy",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The policy associated to an instance-group"
+		},
+		{
+			"from": "vserver",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "subnet",
+			"to": "zone",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A fabric subnet belongs to a zone."
+		},
+		{
+			"from": "bgp-neighbor",
+			"to": "autonomous-system",
+			"label": "org.onap.relationships.inventory.network.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "bgp-neighbor is a member of an autonomous-system."
+		},
+		{
+			"from": "chassis",
+			"to": "rack",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "A chassis is LocatedIn a rack."
+		},
+		{
+			"from": "card-slot",
+			"to": "chassis",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A card-slot is located in a chassis."
+		},
+		{
+			"from": "activity",
+			"to": "network-range",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "An activity is being performed on a network-range."
+		},
+		{
+			"from": "profile",
+			"to": "p-interface",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A profile (set of characteristics) applies to the p-interface."
+		},
+		{
+			"from": "chassis",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A chassis LinksTo a complex."
+		},
+		{
+			"from": "policy",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "relationship-rule",
+			"to": "profile",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "Details relationships profile requires."
+		},
+		{
+			"from": "port",
+			"to": "card",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A port is located in a card."
+		},
+		{
+			"from": "hw-component",
+			"to": "profile",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The profile associated to a hw-component"
+		},
+		{
+			"from": "chassis",
+			"to": "pserver",
+			"label": "org.onap.relationships.inventory.PartOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A chassis is part of a pserver."
+		},
+		{
+			"from": "mapping",
+			"to": "mapping",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The mapping associated to a mapping"
+		},
+		{
+			"from": "mapping",
+			"to": "mapping",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description": "The mapping associated to a mapping"
+		},
+		{
+			"from": "bgp-neighbor",
+			"to": "l3-interface-ipv6-address-list",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "bgp-neighbor uses To node-type."
+		},
+		{
+			"from": "object-group",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The object-group is located in a complex"
+		},
+		{
+			"from": "pserver",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "l3-interface-ipv4-address-list",
+			"to": "lag-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A IPv4 address associated with a lag-interface."
+		},
+		{
+			"from": "rack",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A rack is located in a complex (aka building)."
+		},
+		{
+			"from": "host-aggregate",
+			"to": "pserver",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "selector-list",
+			"to": "rule",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "complex",
+			"to": "geo-region",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The complex associated to a geo-region"
+		},
+		{
+			"from": "profile",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A profile (set of characteristics) applies to the vlan-range."
+		},
+		{
+			"from": "metadatum",
+			"to": "profile",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "cloud-region",
+			"to": "geo-region",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The cloud-region associated to a geo-region"
+		},
+		{
+			"from": "bgp-neighbor",
+			"to": "pnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A bgp-neighbor belongs to a pnf."
+		},
+		{
+			"from": "chassis",
+			"to": "hardware-catalog-item",
+			"label": "org.onap.relationships.inventory.IsA",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "The chassis is described by the hardware-catalog-item."
+		},
+		{
+			"from": "port-list",
+			"to": "rule",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "cloud-region",
+			"to": "service-instance",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "contact",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.Supports",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "The contact supports a complex."
+		},
+		{
+			"from": "bgp-neighbor",
+			"to": "l3-interface-ipv4-address-list",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "bgp-neighbor uses To node-type."
+		},
+		{
+			"from": "pnf",
+			"to": "sw-component",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The sw-component associated to a pnf"
+		},
+		{
+			"from": "address-family",
+			"to": "bgp-neighbor",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "Address Family belongs to a bgp-neighbor"
+		},
+		{
+			"from": "ip-address-list",
+			"to": "subnet",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "service-instance",
+			"to": "vrf",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "This edge relates a vrf that is configured on a pnf to the service-instances that the vrf supports."
+		},
+		{
+			"from": "relationship-rule",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "Details relationships object-group requires"
+		},
+		{
+			"from": "chassis",
+			"to": "rack-unit",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "A chassis uses space in a rack (aka one or more rack-units)."
+		},
+		{
+			"from": "activity",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The activity applies to a cloud-region."
+		},
+		{
+			"from": "profile",
+			"to": "vrf",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A profile (set of characteristics) applies to the vrf."
+		},
+		{
+			"from": "bgp-group",
+			"to": "subnet",
+			"label": "org.onap.relationships.inventory.Source",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "To node-type is source of bgp-group."
+		},
+		{
+			"from": "bgp-group",
+			"to": "subnet",
+			"label": "org.onap.relationships.inventory.Destination",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "false",
+			"description": "To node-type is destination of bgp-group."
+		},
+		{
+			"from": "contact",
+			"to": "pserver",
+			"label": "org.onap.relationships.inventory.Supports",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "The contact supports a pserver."
+		},
+		{
+			"from": "policy",
+			"to": "bgp-neighbor",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A policy applies to a bgp-neighbor."
+		},
+		{
+			"from": "ip-address-list",
+			"to": "rule",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "policy",
+			"to": "rule",
+			"label": "org.onap.relationships.inventory.Implements",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "host-aggregate",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "contact",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.Supports",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "The contact supports a cloud-region."
+		},
+		{
+			"from": "pluggable",
+			"to": "hardware-catalog-item",
+			"label": "org.onap.relationships.inventory.IsA",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "The pluggable is described by the hardware-catalog-item."
+		},
+		{
+			"from": "profile",
+			"to": "subnet",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A profile (set of characteristics) applies to the subnet."
+		},
+		{
+			"from": "pnf",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A pnf is located in (aka supports) a cloud-region."
+		},
+		{
+			"from": "profile",
+			"to": "pserver",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A profile (set of characteristics) applies to the pserver."
+		},
+		{
+			"from": "configuration",
+			"to": "bgp-neighbor",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The configuration Uses bgp-neighbor."
+		},
+		{
+			"from": "bgp-neighbor",
+			"to": "vip-ipv4-address-list",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "bgp-neighbor uses To node-type."
+		},
+		{
+			"from": "cable",
+			"to": "physical-link",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A cable is composed of one or more physical-links."
+		},
+		{
+			"from": "bgp-group",
+			"to": "vip-ipv4-address-list",
+			"label": "org.onap.relationships.inventory.Source",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "To node-type is source of bgp-group."
+		},
+		{
+			"from": "bgp-group",
+			"to": "vip-ipv4-address-list",
+			"label": "org.onap.relationships.inventory.Destination",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "false",
+			"description": "To node-type is destination of bgp-group."
+		},
+		{
+			"from": "object-group",
+			"to": "vrf",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "The object-group to VRF for various route types."
+		},
+		{
+			"from": "l-interface",
+			"to": "pnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A logical interface associated with a pnf."
+		},
+		{
+			"from": "port",
+			"to": "chassis",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A port is LocatedIn a chassis."
+		},
+		{
+			"from": "profile",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A profile (set of characteristics) applies to the endpoint."
+		},
+		{
+			"from": "validation-audit",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The validation-audit associated to a cloud-region"
+		},
+		{
+			"from": "pluggable-slot",
+			"to": "chassis",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A pluggable-slot is located in a chassis."
+		},
+		{
+			"from": "configuration",
+			"to": "subnet",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A configuration uses a subnet"
+		},
+		{
+			"from": "network-range",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The network-range is located in a cloud-region"
+		},
+		{
+			"from": "rack",
+			"to": "hardware-catalog-item",
+			"label": "org.onap.relationships.inventory.IsA",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "The rack is this item from the hardware-catalog."
+		},
+		{
+			"from": "mapping",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The mapping associated to an instance-group"
+		},
+		{
+			"from": "mapping",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.Current",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description": ""
+		},
+		{
+			"from": "mapping",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.Target",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description": ""
+		},
+		{
+			"from": "cloud-region",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "pnf",
+			"to": "hw-component",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The hw-component associated to a pnf"
+		},
+		{
+			"from": "port",
+			"to": "p-interface",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A port is composed of one or more p-interfaces."
+		},
+		{
+			"from": "validation-audit",
+			"to": "line-of-business",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The line-of-business associated to a validation-audit"
+		},
+		{
+			"from": "object-group",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The object-gorup that applies to an object-group"
+		},
+        {
+            "from": "generic-vnf",
+            "to": "object-group",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":"A relationship that ties the device to the prefix-list/community-list."
+        },
+		{
+			"from": "profile",
+			"to": "physical-link",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A profile (set of characteristics) applies to the physical-link."
+		},
+		{
+			"from": "instance-group",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The instance-group associated to an instance-group"
+		},
+		{
+			"from": "bgp-group",
+			"to": "l3-interface-ipv6-address-list",
+			"label": "org.onap.relationships.inventory.Source",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "To node-type is source of bgp-group."
+		},
+		{
+			"from": "bgp-group",
+			"to": "l3-interface-ipv6-address-list",
+			"label": "org.onap.relationships.inventory.Destination",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "false",
+			"description": "To node-type is destination of bgp-group."
+		},
+		{
+			"from": "object-group",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The object-group is located in a cloud-region"
+		},
+		{
+			"from": "profile",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A profile (set of characteristics) applies to the l-interface."
+		},
+		{
+			"from": "policy",
+			"to": "vrf",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "rule",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "rule",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "false",
+			"description": ""
+		},
+		{
+			"from": "rule",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.Source",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "false",
+			"description": ""
+		},
+		{
+			"from": "rule",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.Destination",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "false",
+			"description": ""
+		},
+		{
+			"from": "mapping",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The mapping associated to a cloud-region"
+		},
+		{
+			"from": "autonomous-system",
+			"to": "zone",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A local autonomous-system is located in a zone."
+		},
+		{
+			"from": "pdu",
+			"to": "rack-unit",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "A pdu uses space in a rack (aka one or more rack-units)."
+		},
+		{
+			"from": "selector-list",
+			"to": "policy",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "rack",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "The rack is a member of the instance-group (rack-group or pod)."
+		},
+		{
+			"from": "contact",
+			"to": "zone",
+			"label": "org.onap.relationships.inventory.Supports",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "The contact supports a zone."
+		},
+		{
+			"from": "bgp-neighbor",
+			"to": "subnet",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "bgp-neighbor belongs To a subnet."
+		},
+		{
+			"from": "activity",
+			"to": "pnf",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The activity applies to a pnf."
+		},
+		{
+			"from": "profile",
+			"to": "vlan-tag",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A profile (set of characteristics) applies to the vlan-tag."
+		},
+		{
+			"from": "profile",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "The profile (set of characteristics) classifies the object-group."
+		},
+		{
+			"from": "l-interface",
+			"to": "pserver",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A logical interface associated with a pserver."
+		},
+		{
+			"from": "chassis",
+			"to": "pnf",
+			"label": "org.onap.relationships.inventory.PartOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A chassis is part of a pnf."
+		},
+		{
+			"from": "object-group",
+			"to": "zone",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The object-group is located in a zone"
+		},
+		{
+			"from": "network-route",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "The route is part of part of a route-list that is modeled in an object-group."
+		},
+		{
+			"from": "bgp-neighbor",
+			"to": "vrf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A bgp-neighbor belongs to a vrf."
+		},
+		{
+			"from": "port",
+			"to": "cable",
+			"label": "tosca.relationships.network.LinksTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A channel-interface terminates a channel-link."
+		},
+		{
+			"from": "pserver",
+			"to": "project",
+			"label": "org.onap.relationships.inventory.PartOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The pserver is part of a project (ex, VPMO that ordered the equipment)."
+		},
+		{
+			"from": "license",
+			"to": "chassis",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A license belongs to a chassis."
+		},
+		{
+			"from": "cloud-region",
+			"to": "policy",
+			"label": "org.onap.relationships.inventory.Implements",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "a cloud-region implements policies"
+		},
+		{
+			"from": "port",
+			"to": "port",
+			"label": "org.onap.relationships.inventory.LinksTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A port LinksTo another port."
+		},
+		{
+			"from": "card",
+			"to": "card-slot",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A card is located in a card-slot."
+		},
+		{
+			"from": "aggregate-route",
+			"to": "vrf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "An aggregate-route BelongsTo a vrf."
+		},
+		{
+			"from": "pnf",
+			"to": "project",
+			"label": "org.onap.relationships.inventory.PartOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The pnf is part of a project (ex, VPMO that ordered the equipment)."
+		},
+		{
+			"from": "vpn-binding",
+			"to": "aggregate-route",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A vpn-binding uses many aggregate routes"
+		},
+		{
+			"from": "card",
+			"to": "hardware-catalog-item",
+			"label": "org.onap.relationships.inventory.IsA",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "The card is described by the hardware-catalog-item."
+		},
+		{
+			"from": "profile",
+			"to": "pnf",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A profile (set of characteristics) applies to the pnf."
+		},
+		{
+			"from": "cable",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A cable is located in a complex."
+		},
+		{
+			"from": "pluggable-slot",
+			"to": "card",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A pluggable slot is located in a card."
+		},
+		{
+			"from": "pnf",
+			"to": "policy",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A pnf uses policies"
+		},
+		{
+			"from": "profile",
+			"to": "pdu",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "None",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "The profile (set of characteristics) applies to the pdu."
+		},
+		{
+			"from": "profile",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A profile (set of characteristics) applies to the l3-network."
+		},
+		{
+			"from": "bgp-group",
+			"to": "vrf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A bgp-group  belongs to a pnf."
+		},
+		{
+			"from": "bgp-neighbor",
+			"to": "logical-link",
+			"label": "tosca.relationships.network.LinksTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A policy applies to a bgp-neighbor."
+		},
+		{
+			"from": "generic-vnf",
+			"to": "bgp-neighbor",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The bgp-neighbor associated to a generic-vnf."
+		},
+		{
+			"from": "pluggable",
+			"to": "cable",
+			"label": "org.onap.relationships.inventory.PartOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A pluggable that is intergrated with a cable."
+		},
+		{
+			"from": "relationship-component",
+			"to": "relationship-rule",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "Defines the traversal needed to reach the node of relationship-rule"
+		},
+		{
+			"from": "vserver",
+			"to": "sw-component",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The sw-component associated to a vserver"
+		},
+		{
+			"from": "ip-address-list",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "profile",
+			"to": "pluggable",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "The profile (set of characteristics) applies to the pluggable."
+		},
+		{
+			"from": "object-group",
+			"to": "pnf",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "cable",
+			"to": "hardware-catalog-item",
+			"label": "org.onap.relationships.inventory.IsA",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "The cable is this item from the hardware-catalog."
+		},
+		{
+			"from": "activity",
+			"to": "p-interface",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The activity applies to a p-interface."
+		},
+		{
+			"from": "vlan-characteristic",
+			"to": "vlan-tag",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "policy",
+			"to": "vpn-binding",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A policy uses vpn-bindings"
+		},
+		{
+			"from": "community-list",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "profile",
+			"to": "rack",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "The profile (set of characteristics) applies to the rack."
+		},
+		{
+			"from": "contact",
+			"to": "pnf",
+			"label": "org.onap.relationships.inventory.Supports",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "The contact supports a pnf."
+		},
+		{
+			"from": "l3-interface-ipv6-address-list",
+			"to": "p-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A IPv6 address associated with a p-interface."
+		},
+		{
+			"from": "configuration",
+			"to": "policy",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A configuration uses a policy"
+		},
+		{
+			"from": "profile",
+			"to": "logical-link",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A profile (set of characteristics) applies to the logical-link."
+		},
+		{
+			"from": "policy",
+			"to": "bgp-group",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A policy applies to a bgp-group."
+		},
+		{
+			"from": "profile",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A profile (set of characteristics) applies to the instance-group (as a vrrp group)."
+		},
+		{
+			"from": "port-list",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "pluggable",
+			"to": "pluggable-slot",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "A pluggable is located in a pluggable-slot."
+		},
+		{
+			"from": "profile",
+			"to": "card",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "The profile (set of characteristics) applies to the card."
+		},
+		{
+			"from": "cloud-region",
+			"to": "project",
+			"label": "org.onap.relationships.inventory.PartOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The cloud-region is part of a project (ex, project that built out the cloud region)."
+		},
+		{
+			"from": "network-route",
+			"to": "subnet",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The route is part of part of a subnet."
+		},{
+			"from": "l-interface",
+			"to": "next-hop",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The l-interface that is used by the next-hop."
+		},{
+			"from": "network-route",
+			"to": "next-hop",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The network-route that is used by the next-hop."
+		},{
+			"from": "rule",
+			"to": "next-hop",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The rule that is used by the next-hop. For CG-NAT these are the ACL policies."
+		},{
+			"from": "vrf",
+			"to": "next-hop",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The vrfs that are used by the next-hop."
+		},{
+			"from": "next-hop",
+			"to": "bfd",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},{
+			"from": "ip-address-list",
+			"to": "l3-interface-ipv4-address-list",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "This edge relates an object-group's ip-address-list through reference from DLP data to an ip-address from FCT in the l3-interface-ipv4-address-list of an R-Leaf's l-interface that is for VLAN 2"
+		},{
+			"from": "ip-address-list",
+			"to": "l3-interface-ipv6-address-list",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "This edge relates an object-group's ip-address-list through reference from DLP data to an ip-address from FCT in the l3-interface-ipv6-address-list of an R-Leaf's l-interface that is for VLAN 2"
+		},{
+			"from": "ip-address-list",
+			"to": "vip-ipv4-address-list",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "This edge relates an object-group's ip-address-list through reference from DLP data to an ip-address from FCT in the vip-ipv4-address-list of an R-Leaf's l-interface that is for VLAN 2"
+		},{
+			"from": "ip-address-list",
+			"to": "vip-ipv6-address-list",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "This edge relates an object-group's ip-address-list through reference from DLP data to an ip-address from FCT in the vip-ipv6-address-list of an R-Leaf's l-interface that is for VLAN 2"
+		},{
+			"from": "configuration",
+			"to": "network-route",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "Relates configuration to network-route for static routes."
+		},{
+			"from": "l3-network",
+			"to": "network-route",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "Relates l3-network to network-route for static routes."
+		},{
+			"from": "vrf",
+			"to": "network-route",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "Relates vrf to network-route for static routes."
+		},{
+			"from": "fqdn",
+			"to": "l3-interface-ipv4-address-list",
+			"label": "org.onap.relationships.inventory.network.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The fqdn that applies to a l3-interface-ipv4-address-list."
+		},{
+			"from": "fqdn",
+			"to": "l3-interface-ipv6-address-list",
+			"label": "org.onap.relationships.inventory.network.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The fqdn that applies to a l3-interface-ipv6-address-list."
+		},{
+			"from": "fqdn",
+			"to": "vip-ipv4-address-list",
+			"label": "org.onap.relationships.inventory.network.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The fqdn that applies to a vip-ipv4-address-list."
+		},{
+			"from": "fqdn",
+			"to": "vip-ipv6-address-list",
+			"label": "org.onap.relationships.inventory.network.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The fqdn that applies to a vip-ipv6-address-list."
+		},{
+			"from": "fqdn",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.network.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The fqdn that applies to a generic-vnf."
+		},{
+			"from": "fqdn",
+			"to": "fqdn",
+			"label": "org.onap.relationships.inventory.network.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The dns cname record that applies to an A-record (ipv4) and/or quad-A-record (ipv6)."
+		},{
+			"from": "pnf",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":"used for CSP pnf to cloud-region."
+		},{
+			"from": "logical-link",
+			"to": "port",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"The port associated with a logical-link"
+		}
+	]
+}
diff --git a/src/app/assets/configuration/aai/oxm.xml b/src/app/assets/configuration/aai/oxm.xml
new file mode 100644
index 0000000..006159c
--- /dev/null
+++ b/src/app/assets/configuration/aai/oxm.xml
@@ -0,0 +1,11559 @@
+<!--
+  ============LICENSE_START=======================================================
+  org.openecomp.aai
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  --><xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v23" xml-mapping-metadata-complete="true">
+    <xml-schema element-form-default="QUALIFIED">
+        <xml-ns namespace-uri="http://org.onap.aai.inventory/v23"/>
+    </xml-schema>
+    <java-types>
+        <java-type name="Inventory">
+            <xml-root-element name="inventory"/>
+            <java-attributes>
+                <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v23.CloudInfrastructure"/>
+                <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v23.Business"/>
+                <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v23.ServiceDesignAndCreation"/>
+                <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v23.Network"/>
+                <xml-element java-attribute="common" name="common" type="inventory.aai.onap.org.v23.Common"/>
+            </java-attributes>
+        </java-type>
+
+
+        <java-type name="CloudInfrastructure">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for cloud infrastructure."/>
+            </xml-properties>
+            <xml-root-element name="cloud-infrastructure"/>
+            <java-attributes>
+                <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v23.Complexes"/>
+                <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v23.CloudRegions"/>
+                <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v23.NetworkProfiles"/>
+                <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v23.Pservers"/>
+                <xml-element java-attribute="endpoints" name="endpoints" type="inventory.aai.onap.org.v23.Endpoints"/>
+                <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v23.VirtualDataCenters"/>
+                <xml-element java-attribute="operationalEnvironments" name="operational-environments" type="inventory.aai.onap.org.v23.OperationalEnvironments"/>
+                <xml-element java-attribute="geoRegions" name="geo-regions" type="inventory.aai.onap.org.v23.GeoRegions"/>
+                <xml-element java-attribute="networkTechnologies" name="network-technologies" type="inventory.aai.onap.org.v23.NetworkTechnologies"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="CloudRegions">
+            <xml-root-element name="cloud-regions"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v23.CloudRegion"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="CloudRegion">
+            <xml-root-element name="cloud-region"/>
+            <java-attributes>
+                <xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the vendor and cloud name, e.g., att-aic. First part of composite key should be formatted as vendor-cloudname"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudType" name="cloud-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the cloud (e.g., openstack)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ownerDefinedType" name="owner-defined-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Cloud-owner defined type indicator (e.g., dcp, lcp)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudRegionVersion" name="cloud-region-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL of the keystone identity service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudZone" name="cloud-zone" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sriovAutomation" name="sriov-automation" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Whether the cloud region supports (true) or does not support (false) SR-IOV automation."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudRegionNumber" name="cloud-region-number" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Number that maps to the letter at the end of the cloud-region-id."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudFunction" name="cloud-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Function of cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudRole" name="cloud-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role of cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudRegionNumberDefinition" name="cloud-region-number-definition" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The alias used for this cloud."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="status" name="status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Status of cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="upgradeCycle" name="upgrade-cycle" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Upgrade cycle for the cloud region. For AIC regions upgrade cycle is designated by A,B,C etc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationDisabled" name="orchestration-disabled" required="true" type="java.lang.Boolean" default-value="false">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Used to indicate whether orchestration is enabled for this cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Used to indicate whether or not cloud-region object is in maintenance mode."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v23.VolumeGroups"/>
+                <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v23.Tenants"/>
+                <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v23.Flavors"/>
+                <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v23.GroupAssignments"/>
+                <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v23.Snapshots"/>
+                <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v23.Images"/>
+                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v23.DvsSwitches"/>
+                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v23.OamNetworks"/>
+                <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v23.AvailabilityZones"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v23.VipIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v23.VipIpv6AddressList"/>
+                <xml-element java-attribute="vlanRanges" name="vlan-ranges" type="inventory.aai.onap.org.v23.VlanRanges"/>
+                <xml-element java-attribute="hostAggregates" name="host-aggregates" type="inventory.aai.onap.org.v23.HostAggregates"/>
+                <xml-element java-attribute="activities" name="activities" type="inventory.aai.onap.org.v23.Activities"/>
+                <xml-element java-attribute="validationAudits" name="validation-audits" type="inventory.aai.onap.org.v23.ValidationAudits"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&amp;T's AIC."/>
+                <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="owner-defined-type"/>
+                <xml-property name="container" value="cloud-regions"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}"/>
+                <xml-property name="requiredProps" value="cloud-owner,cloud-region-id,orchestration-disabled,in-maint"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="HostAggregates">
+            <xml-properties>
+                <xml-property name="description" value="Collection of HostAggregates."/>
+            </xml-properties>
+            <xml-root-element name="host-aggregates"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="hostAggregate" name="host-aggregate" type="inventory.aai.onap.org.v23.HostAggregate"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="HostAggregate">
+            <xml-root-element name="host-aggregate"/>
+            <java-attributes>
+                <xml-element java-attribute="hostAggregateId" name="host-aggregate-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier for the host-aggregate."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hostAggregateName" name="host-aggregate-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the host-aggregate."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes an hostAggregates"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="host-aggregates"/>
+                <xml-property name="uriTemplate" value="/host-aggregates/host-aggregate/{host-aggregate-id}"/>
+                <xml-property name="requiredProps" value="host-aggregate-id,host-aggregate-name"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VlanRanges">
+            <xml-root-element name="vlan-ranges"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlanRange" name="vlan-range" type="inventory.aai.onap.org.v23.VlanRange"/>
+            </java-attributes>
+            <xml-properties>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VlanRange">
+            <xml-root-element name="vlan-range"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanRangeId" name="vlan-range-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="vlan id in range UUID."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdLower" name="vlan-id-lower" required="true" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="vlan id in range lower"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdUpper" name="vlan-id-upper" required="true" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="vlan id in range upper"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanType" name="vlan-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="vlan type"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v23.VlanTags"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of vlan range"/>
+                <xml-property name="indexedProps" value="vlan-range-id,vlan-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="vlan-ranges"/>
+                <xml-property name="uriTemplate" value="/vlan-ranges/vlan-range/{vlan-range-id}"/>
+                <xml-property name="requiredProps" value="vlan-range-id,vlan-id-lower,vlan-id-upper,vlan-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VolumeGroups">
+            <xml-properties>
+                <xml-property name="description" value="Collection of persistent block-level storage."/>
+            </xml-properties>
+            <xml-root-element name="volume-groups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v23.VolumeGroup"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VolumeGroup">
+            <xml-root-element name="volume-group"/>
+            <java-attributes>
+                <xml-element java-attribute="volumeGroupId" name="volume-group-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of volume-group."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="volumeGroupName" name="volume-group-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the volume group."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this volume-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this volume-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfModuleModelCustomizationId" name="vf-module-model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="helps relate the volume group to the vf-module whose components will require the volume group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Persistent block-level storage."/>
+                <xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="volume-groups"/>
+                <xml-property name="uriTemplate" value="/volume-groups/volume-group/{volume-group-id}"/>
+                <xml-property name="requiredProps" value="volume-group-id,vnf-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Complexes">
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
+            </xml-properties>
+            <xml-root-element name="complexes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v23.Complex"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Complex">
+            <xml-root-element name="complex"/>
+            <java-attributes>
+                <xml-element java-attribute="physicalLocationId" name="physical-location-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier for physical location, e.g., CLLI"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Data center code which can be an alternate way to identify a complex"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Gamma complex name for LCP instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL of the keystone identity service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="physicalLocationType" name="physical-location-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type, e.g., central office, data center."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="timeZone" name="time-zone" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The time zone where the complex is located."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="street2" name="street2" type="java.lang.String"/>
+                <xml-element java-attribute="city" name="city" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="state" name="state" type="java.lang.String"/>
+                <xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="country" name="country" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="region" name="region" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="latitude" name="latitude" type="java.lang.String"/>
+                <xml-element java-attribute="longitude" name="longitude" type="java.lang.String"/>
+                <xml-element java-attribute="elevation" name="elevation" type="java.lang.String"/>
+                <xml-element java-attribute="lata" name="lata" type="java.lang.String"/>
+                <xml-element java-attribute="racks" name="racks" type="inventory.aai.onap.org.v23.Racks"/>
+                <xml-element java-attribute="cables" name="cables" type="inventory.aai.onap.org.v23.Cables"/>
+                <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v23.CtagPools"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
+                <xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="physical-location-id"/>
+                <xml-property name="container" value="complexes"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/complexes/complex/{physical-location-id}"/>
+                <xml-property name="requiredProps" value="physical-location-id,physical-location-type,street1,city,postal-code,country,region"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Racks">
+            <xml-root-element name="racks"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="rack" name="rack" type="inventory.aai.onap.org.v23.Rack"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Rack">
+            <xml-root-element name="rack"/>
+            <java-attributes>
+                <xml-element java-attribute="rackName" name="rack-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="A unique name for the rack (within the location)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rackType" name="rack-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The type of rack."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rackLocation" name="rack-location" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The location of the rack within the building."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rackPosition" name="rack-position" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The position of the rack (ex-floor-mounted)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="rackPowerDiversity" name="rack-power-diversity" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value=""/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="rackUnits" name="rack-units" type="inventory.aai.onap.org.v23.RackUnits"/>
+                <xml-element java-attribute="pdus" name="pdus" type="inventory.aai.onap.org.v23.Pdus"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of rack"/>
+                <xml-property name="uniqueProps" value="rack-name"/>
+                <xml-property name="indexedProps" value="rack-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="complex"/>
+                <xml-property name="container" value="racks"/>
+                <xml-property name="uriTemplate" value="/racks/rack/{rack-name}"/>
+                <xml-property name="requiredProps" value="rack-name,rack-type,rack-location,rack-power-diversity"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Cables">
+            <xml-root-element name="cables"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cable" name="cable" type="inventory.aai.onap.org.v23.Cable"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Cable">
+            <xml-root-element name="cable"/>
+            <java-attributes>
+                <xml-element java-attribute="cableName" name="cable-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="A unique name for the channel-link relative to the physical-link."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cableType" name="cable-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The type of cable."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of cable"/>
+                <xml-property name="indexedProps" value="cable-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="complex"/>
+                <xml-property name="container" value="cables"/>
+                <xml-property name="uriTemplate" value="/cables/cable/{cable-name}"/>
+                <xml-property name="requiredProps" value="cable-name,cable-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="RackUnits">
+            <xml-root-element name="rack-units"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="rackUnit" name="rack-unit" type="inventory.aai.onap.org.v23.RackUnit"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RackUnit">
+            <xml-root-element name="rack-unit"/>
+            <java-attributes>
+                <xml-element java-attribute="rackUnitName" name="rack-unit-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="A unique name for the rack-unit (within the rack)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of rack-unit"/>
+                <xml-property name="indexedProps" value="rack-unit-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="rack"/>
+                <xml-property name="container" value="rack-units"/>
+                <xml-property name="uriTemplate" value="/rack-units/rack-unit/{rack-unit-name}"/>
+                <xml-property name="requiredProps" value="rack-unit-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Pdus">
+            <xml-root-element name="pdus"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pdu" name="pdu" type="inventory.aai.onap.org.v23.Pdu"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Pdu">
+            <xml-root-element name="pdu"/>
+            <java-attributes>
+                <xml-element java-attribute="pduName" name="pdu-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="A unique name for the power distribution unit."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pduType" name="pdu-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The type of pdu."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of pdu"/>
+                <xml-property name="uniqueProps" value="pdu-name"/>
+                <xml-property name="indexedProps" value="pdu-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="rack"/>
+                <xml-property name="container" value="pdus"/>
+                <xml-property name="uriTemplate" value="/pdus/pdu/{pdu-name}"/>
+                <xml-property name="requiredProps" value="pdu-name,pdu-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="CtagPools">
+            <xml-root-element name="ctag-pools"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v23.CtagPool"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="CtagPool">
+            <xml-root-element name="ctag-pool"/>
+            <java-attributes>
+                <xml-element java-attribute="targetPe" name="target-pe" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="The Target provider edge router"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the availability zone"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Describes what the intended purpose of this pool is."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Comma separated list of ctags"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose."/>
+                <xml-property name="indexedProps" value="availability-zone-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="complex"/>
+                <xml-property name="container" value="ctag-pools"/>
+                <xml-property name="uriTemplate" value="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}"/>
+                <xml-property name="requiredProps" value="target-pe,availability-zone-name,ctag-pool-purpose"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Tenants">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack tenants."/>
+            </xml-properties>
+            <xml-root-element name="tenants"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v23.Tenant"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Tenant">
+            <xml-root-element name="tenant"/>
+            <java-attributes>
+                <xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id relative to the cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Readable name of tenant"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tenantContext" name="tenant-context" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field will store the tenant context."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="parentId" name="parent-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="tenant parent-id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v23.Vservers"/>
+                <xml-element java-attribute="nosServers" name="nos-servers" type="inventory.aai.onap.org.v23.NosServers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack tenant"/>
+                <xml-property name="nameProps" value="tenant-name"/>
+                <xml-property name="indexedProps" value="tenant-name,tenant-id,tenant-context,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="tenants"/>
+                <xml-property name="uriTemplate" value="/tenants/tenant/{tenant-id}"/>
+                <xml-property name="requiredProps" value="tenant-id,tenant-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="NosServers">
+            <xml-properties>
+                <xml-property name="description" value="nos-server is the execution environment that will have images, certain versions of VNOS, running on it."/>
+            </xml-properties>
+            <xml-root-element name="nos-servers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="nosServer" name="nos-server" type="inventory.aai.onap.org.v23.NosServer"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="NosServer">
+            <xml-root-element name="nos-server"/>
+            <java-attributes>
+                <xml-element java-attribute="nosServerId" name="nos-server-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier for this nos relative to its tenant"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nosServerName" name="nos-server-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of nos"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vendor" name="vendor" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="uCPE vendor"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems. Valid values can be found at (https://wiki.web.att.com/display/SPTIIRP/prov-status)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nosServerSelflink" name="nos-server-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This is the execution environment that will have images, certain versions of VNOS, running on it. | A&amp;AI clients for this object are typically: DCAE-DTI/FM/PM; SDNC, (DMaaP-DCAE,...) |"/>
+                <xml-property name="indexedProps" value="nos-server-id,prov-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="tenant"/>
+                <xml-property name="nameProps" value="nos-server-name"/>
+                <xml-property name="container" value="nos-servers"/>
+                <xml-property name="uriTemplate" value="/nos-servers/nos-server/{nos-server-id}"/>
+                <xml-property name="requiredProps" value="nos-server-id,nos-server-name,vendor,nos-server-selflink,in-maint"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Vservers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs."/>
+            </xml-properties>
+            <xml-root-element name="vservers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v23.Vserver"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Vserver">
+            <xml-root-element name="vserver"/>
+            <java-attributes>
+                <xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier for this vserver relative to its tenant"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of vserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternative name of vserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems. Valid values can be found at (https://wiki.web.att.com/display/SPTIIRP/prov-status)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Used to indicate whether closed loop function is enabled on this node"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="numa" name="numa" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Non-uniform memory access optimization, helps prevent memory-bandwidth bottlenecks. Expected values - 1 or 2 identifying memory access"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v23.Volumes"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v23.LInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Virtual Servers, aka virtual machine or VM."/>
+                <xml-property name="nameProps" value="vserver-name"/>
+                <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,vserver-name2,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="tenant"/>
+                <xml-property name="container" value="vservers"/>
+                <xml-property name="uriTemplate" value="/vservers/vserver/{vserver-id}"/>
+                <xml-property name="requiredProps" value="vserver-id,vserver-name,vserver-selflink,in-maint,is-closed-loop-disabled"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="LInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of logical interfaces."/>
+            </xml-properties>
+            <xml-root-element name="l-interfaces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v23.LInterface"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LInterface">
+            <xml-root-element name="l-interface"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name given to the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="MAC address for the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the network"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Human friendly text regarding this interface."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="type to sub-classify the l-interface (ex, loopback)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isPortMirrored" name="is-port-mirrored" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not port is a mirrored."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of the logical interface. Valid values can be found at (https://wiki.web.att.com/display/SPTIIRP/prov-status)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="allowedAddressPairs" name="allowed-address-pairs" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Freeform field for storing an ip address, list of ip addresses or a subnet block."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="priority" name="priority" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Priority used for fail-over. Valid values 1-1024, with 1 being the highest priority."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceFunction" name="interface-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The function performed by this Linterface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="l2Multicasting" name="l2-multicasting" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Identifies l2-multicasting support on an l-interface. true indicates that l2-multicasting is supported; defaulted to false ."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v23.Vlans"/>
+                <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v23.SriovVfs"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v23.LInterfaces"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v23.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v23.L3InterfaceIpv6AddressList"/>
+                <xml-element java-attribute="adminStatus" name="admin-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Administrative status of the interface. Valid values are 'up', 'down', or 'testing'."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Logical interfaces, e.g., a vnic."/>
+                <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name,interface-type,interface-function,interface-role,prov-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface,pnf,pserver"/>
+                <xml-property name="nameProps" value="interface-type"/>
+                <xml-property name="container" value="l-interfaces"/>
+                <xml-property name="uriTemplate" value="/l-interfaces/l-interface/{interface-name}"/>
+                <xml-property name="requiredProps" value="interface-name,is-port-mirrored,in-maint,is-ip-unnumbered"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="SriovVfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of SR-IOV Virtual Functions."/>
+            </xml-properties>
+            <xml-root-element name="sriov-vfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v23.SriovVf"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="SriovVf">
+            <xml-root-element name="sriov-vf"/>
+            <java-attributes>
+                <xml-element java-attribute="pciId" name="pci-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="PCI ID used to identify the sriov-vf"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfVlanFilter" name="vf-vlan-filter" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfMacFilter" name="vf-mac-filter" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfVlanStrip" name="vf-vlan-strip" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfVlanAntiSpoofCheck" name="vf-vlan-anti-spoof-check" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfMacAntiSpoofCheck" name="vf-mac-anti-spoof-check" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfMirrors" name="vf-mirrors" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfBroadcastAllow" name="vf-broadcast-allow" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfUnknownMulticastAllow" name="vf-unknown-multicast-allow" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfUnknownUnicastAllow" name="vf-unknown-unicast-allow" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfInsertStag" name="vf-insert-stag" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfLinkStatus" name="vf-link-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)"/>
+                <xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="l-interface"/>
+                <xml-property name="container" value="sriov-vfs"/>
+                <xml-property name="uriTemplate" value="/sriov-vfs/sriov-vf/{pci-id}"/>
+                <xml-property name="requiredProps" value="pci-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="L3InterfaceIpv4AddressList">
+            <xml-root-element name="l3-interface-ipv4-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 32 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv4 Address Range"/>
+                <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="vlan,l-interface,vnfc,cp,lag-interface,p-interface"/>
+                <xml-property name="uriTemplate" value="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}"/>
+                <xml-property name="requiredProps" value="l3-interface-ipv4-address"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Vlans">
+            <xml-root-element name="vlans"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v23.Vlan"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Vlan">
+            <xml-root-element name="vlan"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="String that identifies the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanType" name="vlan-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The type of vlan (eg. vxlan)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to describe (the service associated with) the vlan"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Whether customer is going to use this VLAN for backdoor connection to another customer premise device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnKey" name="vpn-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of the VLAN configuration related to a logical interface. Valid values can be found at (https://wiki.web.att.com/display/SPTIIRP/prov-status)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Private VLAN indicator."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v23.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v23.L3InterfaceIpv6AddressList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of vlan"/>
+                <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-key,orchestration-status,prov-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="l-interface"/>
+                <xml-property name="container" value="vlans"/>
+                <xml-property name="uriTemplate" value="/vlans/vlan/{vlan-interface}"/>
+                <xml-property name="requiredProps" value="vlan-interface,in-maint,is-ip-unnumbered,is-private"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="L3InterfaceIpv6AddressList">
+            <xml-root-element name="l3-interface-ipv6-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 128 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv6 Address Range"/>
+                <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="vlan,l-interface,vnfc,cp,lag-interface,p-interface"/>
+                <xml-property name="uriTemplate" value="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}"/>
+                <xml-property name="requiredProps" value="l3-interface-ipv6-address"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Volumes">
+            <xml-properties>
+                <xml-property name="description" value="Collection of ephemeral Block storage volumes."/>
+            </xml-properties>
+            <xml-root-element name="volumes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v23.Volume"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Volume">
+            <xml-root-element name="volume"/>
+            <java-attributes>
+                <xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of block storage volume relative to the vserver."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Ephemeral Block storage volume."/>
+                <xml-property name="indexedProps" value="volume-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="vserver"/>
+                <xml-property name="container" value="volumes"/>
+                <xml-property name="uriTemplate" value="/volumes/volume/{volume-id}"/>
+                <xml-property name="requiredProps" value="volume-id,volume-selflink"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Flavors">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack flavors."/>
+            </xml-properties>
+            <xml-root-element name="flavors"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v23.Flavor"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Flavor">
+            <xml-root-element name="flavor"/>
+            <java-attributes>
+                <xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Flavor id, expected to be unique across cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Flavor name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Number of CPUs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Amount of memory"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Disk space"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Amount of ephemeral disk space"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="amount of swap space allocation"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Boolean as to whether this flavor is no longer enabled"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack flavor."/>
+                <xml-property name="nameProps" value="flavor-name"/>
+                <xml-property name="indexedProps" value="flavor-name,flavor-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="flavors"/>
+                <xml-property name="uriTemplate" value="/flavors/flavor/{flavor-id}"/>
+                <xml-property name="requiredProps" value="flavor-id,flavor-name,flavor-selflink"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Snapshots">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack snapshots"/>
+            </xml-properties>
+            <xml-root-element name="snapshots"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v23.Snapshot"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Snapshot">
+            <xml-root-element name="snapshot"/>
+            <java-attributes>
+                <xml-element java-attribute="snapshotId" name="snapshot-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotName" name="snapshot-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Snapshot name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotArchitecture" name="snapshot-architecture" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operating system architecture"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotOsDistro" name="snapshot-os-distro" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotOsVersion" name="snapshot-os-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The operating system version as specified by the distributor."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="application" name="application" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The application that the image instantiates."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The vendor of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The version of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotSelflink" name="snapshot-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="prevSnapshotId" name="prev-snapshot-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack snapshot"/>
+                <xml-property name="nameProps" value="snapshot-name"/>
+                <xml-property name="uniqueProps" value="snapshot-id"/>
+                <xml-property name="indexedProps" value="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="snapshots"/>
+                <xml-property name="uriTemplate" value="/snapshots/snapshot/{snapshot-id}"/>
+                <xml-property name="requiredProps" value="snapshot-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="GroupAssignments">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack group assignments"/>
+            </xml-properties>
+            <xml-root-element name="group-assignments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v23.GroupAssignment"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="GroupAssignment">
+            <xml-root-element name="group-assignment"/>
+            <java-attributes>
+                <xml-element java-attribute="groupId" name="group-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Group id, expected to be unique across cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="groupType" name="group-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group type - the type of group this instance refers to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="groupName" name="group-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group name - name assigned to the group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="groupDescription" name="group-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group description - description of the group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This openstack object is used to store exclusivity groups (EG). | A&amp;AI clients for this object are typically: (DMaaP-DCAE,...) |"/>
+                <xml-property name="nameProps" value="group-name"/>
+                <xml-property name="indexedProps" value="group-id,group-type,group-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="group-assignments"/>
+                <xml-property name="uriTemplate" value="/group-assignments/group-assignment/{group-id}"/>
+                <xml-property name="requiredProps" value="group-id,group-type,group-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Images">
+            <xml-properties>
+                <xml-property name="description" value="Collectio of Openstack images."/>
+            </xml-properties>
+            <xml-root-element name="images"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v23.Image"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Image">
+            <xml-root-element name="image"/>
+            <java-attributes>
+                <xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Image id, expected to be unique across cloud region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Image name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operating system architecture."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The operating system version as specified by the distributor."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="application" name="application" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The application that the image instantiates."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The vendor of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The version of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v23.Metadata"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack image."/>
+                <xml-property name="nameProps" value="image-name"/>
+                <xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="images"/>
+                <xml-property name="uriTemplate" value="/images/image/{image-id}"/>
+                <xml-property name="requiredProps" value="image-id,image-name,image-os-distro,image-os-version,image-selflink"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Metadata">
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object captures the collection of metadatum (key/value pairs) | A&amp;AI clients for this object are typically: DCAE-CCS; MSO, SDNC, (DMaaP-DCAE,...) |"/>
+            </xml-properties>
+            <xml-root-element name="metadata"/>
+            <java-attributes>
+
+                <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v23.Metadatum"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Metadatum">
+            <xml-root-element name="metadatum"/>
+            <java-attributes>
+                <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true"/>
+                <xml-element java-attribute="metaval" name="metaval" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object captures the collection of metadatum (key/value pairs) | A&amp;AI clients for this object are typically: DCAE-CCS; MSO, SDNC, (DMaaP-DCAE,...) |"/>
+                <xml-property name="indexedProps" value="metaname,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="image,service-instance,connector,configuration,model-ver,profile"/>
+                <xml-property name="container" value="metadata"/>
+                <xml-property name="uriTemplate" value="/metadata/metadatum/{metaname}"/>
+                <xml-property name="requiredProps" value="metaname,metaval"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="DvsSwitches">
+            <xml-properties>
+                <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs."/>
+            </xml-properties>
+            <xml-root-element name="dvs-switches"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v23.DvsSwitch"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="DvsSwitch">
+            <xml-root-element name="dvs-switch"/>
+            <java-attributes>
+                <xml-element java-attribute="switchName" name="switch-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="DVS switch name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vcenterUrl" name="vcenter-url" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL used to reach the vcenter"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. "/>
+                <xml-property name="indexedProps" value="vcenter-url,switch-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="dvs-switches"/>
+                <xml-property name="uriTemplate" value="/dvs-switches/dvs-switch/{switch-name}"/>
+                <xml-property name="requiredProps" value="switch-name,vcenter-url"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="NetworkProfiles">
+            <xml-properties>
+                <xml-property name="description" value="Collection of network profiles"/>
+            </xml-properties>
+            <xml-root-element name="network-profiles"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v23.NetworkProfile"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="NetworkProfile">
+            <xml-root-element name="network-profile"/>
+            <java-attributes>
+                <xml-element java-attribute="nmProfileName" name="nm-profile-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique name of network profile."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="communityString" name="community-string" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encrypted SNMP community string"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object captures the Network profile populated by SDN-GP for SNMP | A&amp;AI clients for this object are typically: DCAE-DTI; SDNGP, AAI-PUT, (DMaaP-DCAE,...) |"/>
+                <xml-property name="indexedProps" value="nm-profile-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="network-profiles"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}"/>
+                <xml-property name="requiredProps" value="nm-profile-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Pservers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of compute hosts."/>
+            </xml-properties>
+            <xml-root-element name="pservers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v23.Pserver"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Pserver">
+            <xml-root-element name="pserver"/>
+            <java-attributes>
+                <xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Value from executing hostname on the compute node."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="PTNII name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Number of cpus"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Disk size, in GBs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="RAM size, in MBs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Fully-qualified domain name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Serial number, may be queried"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 OAM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pserverId" name="pserver-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of Pserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="internetTopology" name="internet-topology" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="internet topology of Pserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pserverName2" name="pserver-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="alternative pserver name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="purpose of pserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of this device (not under canopi control). Valid values can be found at (https://wiki.web.att.com/display/SPTIIRP/prov-status)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates who owns and or manages the device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hostProfile" name="host-profile" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The host profile that defines the configuration of the pserver."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="role" name="role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The role performed by the pserver."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="function" name="function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The function performed by the pserver."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v23.PInterfaces"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v23.LInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v23.LagInterfaces"/>
+                <xml-element java-attribute="activities" name="activities" type="inventory.aai.onap.org.v23.Activities"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver."/>
+                <xml-property name="nameProps" value="pserver-name2,fqdn"/>
+                <xml-property name="indexedProps" value="hostname,pserver-id,pserver-name2,inv-status,fqdn,prov-status,ptnii-equip-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="pservers"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/pservers/pserver/{hostname}"/>
+                <xml-property name="requiredProps" value="hostname,in-maint"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="PInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical interfaces."/>
+            </xml-properties>
+            <xml-root-element name="p-interfaces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v23.PInterface"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="PInterface">
+            <xml-root-element name="p-interface"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name that identifies the physical interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceName2" name="interface-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternate name that identifies the physical interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portDescription" name="port-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Nature of the services and connectivity on this port."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CLEI or other specification for p-interface hardware."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role specification for p-interface hardware."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the physical properties of the interface."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems. Valid values can be found at (https://wiki.web.att.com/display/SPTIIRP/prov-status)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="inventory status"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceFunction" name="interface-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The function performed by this pInterface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="MAC address for the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v23.SriovPfs"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v23.LInterfaces"/>
+                <xml-element java-attribute="activities" name="activities" type="inventory.aai.onap.org.v23.Activities"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v23.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v23.L3InterfaceIpv6AddressList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Physical interface (e.g., nic)"/>
+                <xml-property name="indexedProps" value="interface-name,prov-status,interface-function,interface-role,interface-name2,data-owner,data-source,data-source-version"/>
+                <xml-property name="uiEditableProps" value="prov-status,port-description"/>
+                <xml-property name="nameProps" value="prov-status"/>
+                <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
+                <xml-property name="container" value="p-interfaces"/>
+                <xml-property name="uriTemplate" value="/p-interfaces/p-interface/{interface-name}"/>
+                <xml-property name="requiredProps" value="interface-name,in-maint"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="LagInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of link aggregate interfaces."/>
+            </xml-properties>
+            <xml-root-element name="lag-interfaces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v23.LagInterface"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LagInterface">
+            <xml-root-element name="lag-interface"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name that identifies the link aggregate interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Human friendly text regarding this interface."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems. Valid values can be found at (https://wiki.web.att.com/display/SPTIIRP/prov-status)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="lacpSystemId" name="lacp-system-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The system id used by the LACP protocol."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceFunction" name="interface-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The function performed by this Lag interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="minLinks" name="min-links" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Minimum links in service before a LAG should be taken out of service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to identify the type of lag-interface."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v23.LInterfaces"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v23.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v23.L3InterfaceIpv6AddressList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Link aggregate interface"/>
+                <xml-property name="indexedProps" value="interface-name,interface-id,interface-role,interface-function,prov-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="uiEditableProps" value="prov-status"/>
+                <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf"/>
+                <xml-property name="container" value="lag-interfaces"/>
+                <xml-property name="uriTemplate" value="/lag-interfaces/lag-interface/{interface-name}"/>
+                <xml-property name="requiredProps" value="interface-name,in-maint"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Endpoints">
+            <xml-properties>
+                <xml-property name="description" value="Collection of endpoints."/>
+            </xml-properties>
+            <xml-root-element name="endpoints"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="endpoint" name="endpoint" type="inventory.aai.onap.org.v23.Endpoint"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Endpoint">
+            <xml-root-element name="endpoint"/>
+            <java-attributes>
+                <xml-element java-attribute="endpointId" name="endpoint-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier for the endpoint."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="endpointName" name="endpoint-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the endpoint."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="endpointType" name="endpoint-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the endpoint. Expected values are DNS, ETCD, Kubernetes, etc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="endpointName2" name="endpoint-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternate name of the endpoint"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v23.IpAddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="portList" name="port-list" type="inventory.aai.onap.org.v23.PortList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="selectorList" name="selector-list" type="inventory.aai.onap.org.v23.SelectorList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes an endpoints"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="container" value="endpoints"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/endpoints/endpoint/{endpoint-id}"/>
+                <xml-property name="requiredProps" value="endpoint-id"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Activities">
+            <xml-properties>
+                <xml-property name="description" value="Collection of activities."/>
+            </xml-properties>
+            <xml-root-element name="activities"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="activity" name="activity" type="inventory.aai.onap.org.v23.Activity"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Activity">
+            <xml-root-element name="activity"/>
+            <java-attributes>
+                <xml-element java-attribute="activityId" name="activity-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id for the activity. (UUID)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="activityType" name="activity-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of activity (ex, provisioning)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="activityName" name="activity-name" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the activity."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="activityCreator" name="activity-creator" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Application that created the activity."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="activityDescription" name="activity-description" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description of activity."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="activityTimeStamp" name="timestamp" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Date and Time activity is created."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="currentState" name="current-state" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Current state of the activity."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="reflectedState" name="reflected-state" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="State reflected by the database."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="activityRole" name="activity-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="activityFunction" name="activity-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Function"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="timestampLastUpdated" name="timestamp-last-updated" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Date/time last updated"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="timestampExpiration" name="timestamp-expiration" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Date/time expires"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="activityStates" name="activity-states" type="inventory.aai.onap.org.v23.ActivityStates"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes an activities"/>
+                <xml-property name="uniqueProps" value="activity-id"/>
+                <xml-property name="dependentOn" value="pserver,pnf,cloud-region,p-interface,network-range"/>
+                <xml-property name="container" value="activities"/>
+                <xml-property name="uriTemplate" value="/activities/activity/{activity-id}"/>
+                <xml-property name="requiredProps" value="activity-id,activity-type"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ActivityStates">
+            <xml-properties>
+                <xml-property name="description" value="Collection of activity-states"/>
+            </xml-properties>
+            <xml-root-element name="activity-states"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="activityState" name="activity-state" type="inventory.aai.onap.org.v23.ActivityState"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ActivityState">
+            <xml-root-element name="activity-state"/>
+            <java-attributes>
+                <xml-element java-attribute="stateOrder" name="state-order" required="true" type="java.lang.Integer" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Order for the activity state."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="stateName" name="state-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the activity state (ex, NVT-PROV)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="stateView" name="state-view" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="View of the activity state."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes an activities"/>
+                <xml-property name="uniqueProps" value="state-order"/>
+                <xml-property name="dependentOn" value="activity"/>
+                <xml-property name="container" value="activity-states"/>
+                <xml-property name="uriTemplate" value="/activity-states/activity-state/{state-order}"/>
+                <xml-property name="requiredProps" value="state-order,state-name"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Vrfs">
+            <xml-root-element name="vrfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vrf" name="vrf" type="inventory.aai.onap.org.v23.Vrf"/>
+            </java-attributes>
+            <xml-properties>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Vrf">
+            <xml-root-element name="vrf"/>
+            <java-attributes>
+                <xml-element java-attribute="vrfId" name="vrf-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="VRF UUID."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vrfName" name="vrf-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="VRF Name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vrfDescription" name="vrf-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="VRF Description"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Route Distinguisher"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vrfType" name="vrf-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The type of vrf (bridge-domain as an example)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vrfAddressFamily" name="vrf-address-family" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address family (v6/v4/both)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vrfRole" name="vrf-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for the use of this physical link"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vrfFunction" name="vrf-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The function performed by this Linterface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vrfGroupName" name="vrf-group-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Bridge domain group name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bestExternal" name="best-external" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies best-external vrf, best-external=Y if the conditions are met.  otherwise, best-external = N"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPrefixV4" name="max-prefix-v4" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Max prefix for IPv4."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPrefixV6" name="max-prefix-v6" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Max prefix for IPv6."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPrefixThresholdV4" name="max-prefix-threshold-v4" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Max prefix threshold for IPv4."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPrefixThresholdV6" name="max-prefix-threshold-v6" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Max prefix threshold for IPv6."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="labelModeV4" name="label-mode-v4" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Label mode for IPv4."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="labelModeV6" name="label-mode-v6" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Label mode for IPv6."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPathsV4" name="max-paths-v4" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="stores maximum number of paths for IPv4."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPathsV6" name="max-paths-v6" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="stores maximum number of paths for IPv6."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bgpGroups" name="bgp-groups" type="inventory.aai.onap.org.v23.BgpGroups"/>
+                <xml-element java-attribute="bgpNeighbors" name="bgp-neighbors" type="inventory.aai.onap.org.v23.BgpNeighbors"/>
+                <xml-element java-attribute="aggregateRoutes" name="aggregate-routes" type="inventory.aai.onap.org.v23.AggregateRoutes"/>
+                <xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.onap.org.v23.RouteTargets"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This is a technology that allows multiple instances of a routing table to co-exist within the same router at the same time..  VRFs are the same methods of network (L3) isolation/virtualization as VLANs for L2 virtualization. | A&amp;AI clients for this object are typically: CDM/FCT, BICON, PINC/Autogen |"/>
+                <xml-property name="indexedProps" value="vrf-id,vrf-role,vrf-function,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="vrf-name"/>
+                <xml-property name="dependentOn" value="pnf"/>
+                <xml-property name="container" value="vrfs"/>
+                <xml-property name="uriTemplate" value="/vrfs/vrf/{vrf-id}"/>
+                <xml-property name="requiredProps" value="vrf-id,vrf-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="OamNetworks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. "/>
+            </xml-properties>
+            <xml-root-element name="oam-networks"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v23.OamNetwork"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="OamNetwork">
+            <xml-root-element name="oam-network"/>
+            <java-attributes>
+                <xml-element java-attribute="networkUuid" name="network-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the network. Unique across a cloud-region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="cvlan-id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. "/>
+                <xml-property name="nameProps" value="network-name"/>
+                <xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="oam-networks"/>
+                <xml-property name="uriTemplate" value="/oam-networks/oam-network/{network-uuid}"/>
+                <xml-property name="requiredProps" value="network-uuid,network-name,cvlan-tag"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ValidationAudits">
+            <xml-properties>
+                <xml-property name="description" value="Collection of validation-audit"/>
+            </xml-properties>
+            <xml-root-element name="validation-audits"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="validationAudit" name="validation-audit" type="inventory.aai.onap.org.v23.ValidationAudit"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="ValidationAudit">
+            <xml-root-element name="validation-audit"/>
+            <java-attributes>
+                <xml-element java-attribute="validationId" name="validation-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Validation-Audit UUID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="validationRequestId" name="validation-request-id"  type="java.lang.String" >
+                    <xml-properties>
+                        <xml-property name="description" value="Request-id to retrieve data from client related to the specified audit"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="validationStatus" name="validation-status"  type="java.lang.String" >
+                    <xml-properties>
+                        <xml-property name="description" value="Status of the audit"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="validationPhase" name="validation-phase"  type="java.lang.String" >
+                    <xml-properties>
+                        <xml-property name="description" value="Phase in the lifecycle of the configuration"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="validation audit, value of validation status"/>
+                <xml-property name="indexedProps" value="validation-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="validation-id"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="validation-audits"/>
+                <xml-property name="uriTemplate" value="/validation-audits/validation-audit/{validation-id}"/>
+                <xml-property name="requiredProps" value="validation-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="AvailabilityZones">
+            <xml-properties>
+                <xml-property name="description" value="Collection of availability zones"/>
+            </xml-properties>
+            <xml-root-element name="availability-zones"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v23.AvailabilityZone"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="AvailabilityZone">
+            <xml-root-element name="availability-zone"/>
+            <java-attributes>
+                <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the availability zone.  Unique across a cloud region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers"/>
+                <xml-property name="indexedProps" value="availability-zone-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="availability-zones"/>
+                <xml-property name="uriTemplate" value="/availability-zones/availability-zone/{availability-zone-name}"/>
+                <xml-property name="requiredProps" value="availability-zone-name,hypervisor-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VirtualDataCenters">
+            <xml-properties>
+                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context"/>
+            </xml-properties>
+            <xml-root-element name="virtual-data-centers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v23.VirtualDataCenter"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VirtualDataCenter">
+            <xml-root-element name="virtual-data-center"/>
+            <java-attributes>
+                <xml-element java-attribute="vdcId" name="vdc-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of the vdc"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vdcName" name="vdc-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the virtual data center"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object captures virtual organization of cloud infrastructure elements in a data center context | A&amp;AI clients for this object are typically: DCAE-CCS; SDNC |"/>
+                <xml-property name="nameProps" value="vdc-name"/>
+                <xml-property name="indexedProps" value="vdc-name,vdc-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="virtual-data-centers"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}"/>
+                <xml-property name="requiredProps" value="vdc-id,vdc-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Business">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for business related constructs"/>
+            </xml-properties>
+            <xml-root-element name="business"/>
+            <java-attributes>
+                <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v23.Connectors"/>
+                <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v23.Customers"/>
+                <xml-element java-attribute="linesOfBusiness" name="lines-of-business" type="inventory.aai.onap.org.v23.LinesOfBusiness"/>
+                <xml-element java-attribute="owningEntities" name="owning-entities" type="inventory.aai.onap.org.v23.OwningEntities"/>
+                <xml-element java-attribute="platforms" name="platforms" type="inventory.aai.onap.org.v23.Platforms"/>
+                <xml-element java-attribute="projects" name="projects" type="inventory.aai.onap.org.v23.Projects"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Projects">
+            <xml-properties>
+                <xml-property name="description" value="Collection of projects"/>
+            </xml-properties>
+            <xml-root-element name="projects"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="project" name="project" type="inventory.aai.onap.org.v23.Project"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Project">
+            <xml-root-element name="project"/>
+            <java-attributes>
+                <xml-element java-attribute="projectName" name="project-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the project deploying a service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="projectType" name="project-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of project (ex, VPMO)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="projectState" name="project-state" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Current state of the project."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description of the project."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object describes the project | A&amp;AI clients for this object are typically: IDF, SO.BPMN, VID; MSO, (DMaaP-DCAE,...) |"/>
+                <xml-property name="indexedProps" value="project-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="project-name"/>
+                <xml-property name="container" value="projects"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/projects/project/{project-name}"/>
+                <xml-property name="requiredProps" value="project-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Connectors">
+            <xml-properties>
+                <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets"/>
+            </xml-properties>
+            <xml-root-element name="connectors"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v23.Connector"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Connector">
+            <xml-root-element name="connector"/>
+            <java-attributes>
+                <xml-element java-attribute="resourceInstanceId" name="resource-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of resource instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v23.Metadata"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object captures the collection of resource instances to connect a variety of disparate inventory widgets | A&amp;AI clients for this object are typically: (DMaaP-DCAE,...) |"/>
+                <xml-property name="indexedProps" value="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="connectors"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/connectors/connector/{resource-instance-id}"/>
+                <xml-property name="requiredProps" value="resource-instance-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Customers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/>
+            </xml-properties>
+            <xml-root-element name="customers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v23.Customer"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Customer">
+            <xml-root-element name="customer"/>
+            <java-attributes>
+                <xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subscriberType" name="subscriber-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers."/>
+                        <xml-property name="defaultValue" value="CUST"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v23.ServiceSubscriptions"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="customer identifiers to provide linkage back to BSS information."/>
+                <xml-property name="nameProps" value="subscriber-name"/>
+                <xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="global-customer-id"/>
+                <xml-property name="container" value="customers"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/customers/customer/{global-customer-id}"/>
+                <xml-property name="requiredProps" value="global-customer-id,subscriber-name,subscriber-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="LinesOfBusiness">
+            <xml-properties>
+                <xml-property name="description" value="Collection of lines-of-business"/>
+            </xml-properties>
+            <xml-root-element name="lines-of-business"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lineOfBusiness" name="line-of-business" type="inventory.aai.onap.org.v23.LineOfBusiness"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LineOfBusiness">
+            <xml-root-element name="line-of-business"/>
+            <java-attributes>
+                <xml-element java-attribute="lineOfBusinessName" name="line-of-business-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the line-of-business (product)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes a line-of-business"/>
+                <xml-property name="indexedProps" value="line-of-business-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="line-of-business-name"/>
+                <xml-property name="container" value="lines-of-business"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/lines-of-business/line-of-business/{line-of-business-name}"/>
+                <xml-property name="requiredProps" value="line-of-business-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="OwningEntities">
+            <xml-properties>
+                <xml-property name="description" value="Collection of owning-entities"/>
+            </xml-properties>
+            <xml-root-element name="owning-entities"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="owningEntity" name="owning-entity" type="inventory.aai.onap.org.v23.OwningEntity"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="OwningEntity">
+            <xml-root-element name="owning-entity"/>
+            <java-attributes>
+                <xml-element java-attribute="owningEntityId" name="owning-entity-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of an owning entity"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="owningEntityName" name="owning-entity-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Owning entity name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes an owning-entity"/>
+                <xml-property name="indexedProps" value="owning-entity-id,owning-entity-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="owning-entity-id,owning-entity-name"/>
+                <xml-property name="container" value="owning-entities"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/owning-entities/owning-entity/{owning-entity-id}"/>
+                <xml-property name="requiredProps" value="owning-entity-id,owning-entity-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Platforms">
+            <xml-properties>
+                <xml-property name="description" value="Collection of platforms"/>
+            </xml-properties>
+            <xml-root-element name="platforms"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="platform" name="platform" type="inventory.aai.onap.org.v23.Platform"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Platform">
+            <xml-root-element name="platform"/>
+            <java-attributes>
+                <xml-element java-attribute="platformName" name="platform-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the platform"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes a platform"/>
+                <xml-property name="indexedProps" value="platform-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="platform-name"/>
+                <xml-property name="container" value="platforms"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/platforms/platform/{platform-name}"/>
+                <xml-property name="requiredProps" value="platform-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ServiceSubscriptions">
+            <xml-properties>
+                <xml-property name="description" value="Collection of objects that group service instances."/>
+            </xml-properties>
+            <xml-root-element name="service-subscriptions"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v23.ServiceSubscription"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ServiceSubscription">
+            <xml-root-element name="service-subscription"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v23.ServiceInstances">
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Object that group service instances."/>
+                <xml-property name="indexedProps" value="service-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="customer"/>
+                <xml-property name="container" value="service-subscriptions"/>
+                <xml-property name="crossEntityReference" value="service-instance,service-type"/>
+                <xml-property name="uriTemplate" value="/service-subscriptions/service-subscription/{service-type}"/>
+                <xml-property name="requiredProps" value="service-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ServiceInstances">
+            <xml-properties>
+                <xml-property name="description" value="Collection of service instances"/>
+            </xml-properties>
+            <xml-root-element name="service-instances"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v23.ServiceInstance"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ServiceInstance">
+            <xml-root-element name="service-instance"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Uniquely identifies this instance of a service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field will store a name assigned to the service-instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceType" name="service-type" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing type of service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceRole" name="service-role" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing the service role."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="environmentContext" name="environment-context" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field will store the environment context assigned to the service-instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="workloadContext" name="workload-context" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field will store the workload context assigned to the service-instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="internal"/>
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthTotal" name="bandwidth-total" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the total bandwidth to be used for this service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL customers will use to access the vHN Portal."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="An identifier that customers assign to the location where this service is being used."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Path to the controller object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceFunction" name="service-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing function of the service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v23.Metadata"/>
+                <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v23.AllottedResources"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Instance of a service"/>
+                <xml-property name="indexedProps" value="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="service-instance-name"/>
+                <xml-property name="uniqueProps" value="service-instance-id"/>
+                <xml-property name="dependentOn" value="service-subscription"/>
+                <xml-property name="container" value="service-instances"/>
+                <xml-property name="uriTemplate" value="/service-instances/service-instance/{service-instance-id}"/>
+                <xml-property name="requiredProps" value="service-instance-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ServiceDesignAndCreation">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for objects managed by ASDC"/>
+            </xml-properties>
+            <xml-root-element name="service-design-and-creation"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v23.VnfImages"/>
+                <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v23.Services"/>
+                <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v23.ServiceCapabilities"/>
+                <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v23.Models"/>
+                <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v23.NamedQueries"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VnfImages">
+            <xml-properties>
+                <xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
+            </xml-properties>
+            <xml-root-element name="vnf-images"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v23.VnfImage"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VnfImage">
+            <xml-root-element name="vnf-image"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfImageUuid" name="vnf-image-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of this asset"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="application" name="application" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The application that the image instantiates."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVendor" name="application-vendor" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The vendor of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The version of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
+                <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="vnf-image-uuid"/>
+                <xml-property name="container" value="vnf-images"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}"/>
+                <xml-property name="requiredProps" value="vnf-image-uuid,application,application-vendor"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Services">
+            <xml-properties>
+                <xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC."/>
+            </xml-properties>
+            <xml-root-element name="services"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v23.Service"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Service">
+            <xml-root-element name="service"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceId" name="service-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceDescription" name="service-description" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description of the service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceVersion" name="service-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="service version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services."/>
+                <xml-property name="indexedProps" value="service-description,service-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="services"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/services/service/{service-id}"/>
+                <xml-property name="requiredProps" value="service-id,service-description"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ServiceCapabilities">
+            <xml-properties>
+                <xml-property name="description" value="Collection of service capabilities."/>
+            </xml-properties>
+            <xml-root-element name="service-capabilities"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v23.ServiceCapability"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ServiceCapability">
+            <xml-root-element name="service-capability"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this."/>
+                <xml-property name="indexedProps" value="service-type,vnf-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="service-capabilities"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}"/>
+                <xml-property name="requiredProps" value="service-type,vnf-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Network">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for network inventory resources."/>
+            </xml-properties>
+            <xml-root-element name="network"/>
+            <java-attributes>
+                <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v23.LogicalLinks"/>
+                <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v23.SitePairSets"/>
+                <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v23.VpnBindings"/>
+                <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v23.VplsPes"/>
+                <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v23.MulticastConfigurations"/>
+                <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v23.Vces"/>
+                <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v23.Vnfcs"/>
+                <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v23.L3Networks"/>
+                <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v23.NetworkPolicies"/>
+                <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v23.GenericVnfs"/>
+                <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v23.LagLinks"/>
+                <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v23.Newvces"/>
+                <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v23.Pnfs"/>
+                <xml-element java-attribute="chassies" name="chassies" type="inventory.aai.onap.org.v23.Chassies"/>
+                <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v23.PhysicalLinks"/>
+                <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v23.IpsecConfigurations"/>
+                <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v23.RouteTableReferences"/>
+                <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v23.InstanceGroups"/>
+                <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v23.Zones"/>
+                <xml-element java-attribute="autonomousSystems" name="autonomous-systems" type="inventory.aai.onap.org.v23.AutonomousSystems"/>
+                <xml-element java-attribute="networkRanges" name="network-ranges" type="inventory.aai.onap.org.v23.NetworkRanges"/>
+                <xml-element java-attribute="mappings" name="mappings" type="inventory.aai.onap.org.v23.Mappings"/>
+                <xml-element java-attribute="hwComponents" name="hw-components" type="inventory.aai.onap.org.v23.HwComponents"/>
+                <xml-element java-attribute="swComponents" name="sw-components" type="inventory.aai.onap.org.v23.SwComponents"/>
+                <xml-element java-attribute="networkRoutes" name="network-routes" type="inventory.aai.onap.org.v23.NetworkRoutes"/>
+                <xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v23.Configurations"/>
+                <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v23.ForwardingPaths"/>
+                <xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v23.Collections"/>
+                <xml-element java-attribute="nextHops" name="next-hops" type="inventory.aai.onap.org.v23.NextHops"/>
+                <xml-element java-attribute="bfds" name="bfds" type="inventory.aai.onap.org.v23.Bfds"/>
+                <xml-element java-attribute="fqdns" name="fqdns" type="inventory.aai.onap.org.v23.Fqdns"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="Configurations">
+            <xml-properties>
+                <xml-property name="description" value="Collection of configurations"/>
+            </xml-properties>
+            <xml-root-element name="configurations"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="configuration" name="configuration" type="inventory.aai.onap.org.v23.Configuration"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Configuration">
+            <xml-root-element name="configuration"/>
+            <java-attributes>
+                <xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID assigned to configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationType" name="configuration-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="port-mirroring-configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationSubType" name="configuration-sub-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="vprobe, pprobe."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of the configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationSelflink" name="configuration-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details from SDN-GC."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="id of  the configuration used to customize the resource"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tunnelBandwidth" name="tunnel-bandwidth" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="DHV Site Effective Bandwidth"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vendorAllowedMaxBandwidth" name="vendor-allowed-max-bandwidth" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Velocloud Nominal Throughput - VNT"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configPolicyName" name="config-policy-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to capture the name of the fabric configuration policy that was used to generate the payload sent to PINC for fabric configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationRole" name="configuration-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to categorize the configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationFunction" name="configuration-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to categorize the configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="primaryRole" name="primary-role" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Used by some configurations to identify if it's filling a primary role."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationVersion" name="orchestration-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to categorize the configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v23.Metadata"/>
+                <xml-element java-attribute="forwarderEvcs" name="forwarder-evcs" type="inventory.aai.onap.org.v23.ForwarderEvcs"/>
+                <xml-element java-attribute="evcs" name="evcs" type="inventory.aai.onap.org.v23.Evcs"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object captures the generic configuration | A&amp;AI clients for this object are typically: CVASS, DCAE-CCS, PINC, SDNC, SO.BPMN, (DMaaP-DCAE,...) |"/>
+                <xml-property name="indexedProps" value="configuration-id,configuration-name,configuration-type,model-invariant-id,model-version-id,orchestration-status,configuration-role,configuration-function,orchestration-version,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="configuration-id"/>
+                <xml-property name="container" value="configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/configurations/configuration/{configuration-id}"/>
+                <xml-property name="requiredProps" value="configuration-id,configuration-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="LogicalLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of logical connections"/>
+            </xml-properties>
+            <xml-root-element name="logical-links"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v23.LogicalLink"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LogicalLink">
+            <xml-root-element name="logical-link"/>
+            <java-attributes>
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkType" name="link-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of logical link, e.g., evc"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v4, v6, or ds for dual stack (should be att-ip-version)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="For example, static or BGP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indication of operational status of the logical link."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems. Valid values can be found at (https://wiki.web.att.com/display/SPTIIRP/prov-status)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indication of the network use of the logical link."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alias or alternate name (CLCI or D1 name)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkId" name="link-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the logical-link, SDNC generates this."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Reason for this entity, role it is playing"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkDescription" name="link-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="A description for the logical-link."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="segmentId" name="segment-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="A segment-id assigned to the logical-link (ex, esi for ethernet segments)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkFunction" name="link-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The function performed by this logical link"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points"/>
+                <xml-property name="indexedProps" value="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,link-function,link-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="link-id"/>
+                <xml-property name="container" value="logical-links"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/logical-links/logical-link/{link-name}"/>
+                <xml-property name="requiredProps" value="link-name,in-maint,link-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="SitePairSets">
+            <xml-properties>
+                <xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf"/>
+            </xml-properties>
+            <xml-root-element name="site-pair-sets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v23.SitePairSet"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SitePairSet">
+            <xml-root-element name="site-pair-set"/>
+            <java-attributes>
+                <xml-element java-attribute="sitePairSetId" name="site-pair-set-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of site pair set."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v23.RoutingInstances"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Set of instances for probes used to measure service level agreements"/>
+                <xml-property name="indexedProps" value="site-pair-set-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="site-pair-set-id"/>
+                <xml-property name="container" value="site-pair-sets"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/site-pair-sets/site-pair-set/{site-pair-set-id}"/>
+                <xml-property name="requiredProps" value="site-pair-set-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="RoutingInstances">
+            <xml-properties>
+                <xml-property name="description" value="set of probes related to generic-vnf routing instance"/>
+            </xml-properties>
+            <xml-root-element name="routing-instances"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v23.RoutingInstance"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RoutingInstance">
+            <xml-root-element name="routing-instance"/>
+            <java-attributes>
+                <xml-element java-attribute="routingInstanceId" name="routing-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of routing instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rpmOwner" name="rpm-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="rpm owner"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v23.SitePairs"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object is a collection of routing tables, interfaces, and routing protocol parameters. | A&amp;AI clients for this object are typically: SDNC, (DMaaP-DCAE,...) |"/>
+                <xml-property name="indexedProps" value="routing-instance-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="site-pair-set"/>
+                <xml-property name="container" value="routing-instances"/>
+                <xml-property name="uriTemplate" value="/routing-instances/routing-instance/{routing-instance-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="SitePairs">
+            <xml-properties>
+                <xml-property name="description" value="probe within a set"/>
+            </xml-properties>
+            <xml-root-element name="site-pairs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v23.SitePair"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SitePair">
+            <xml-root-element name="site-pair"/>
+            <java-attributes>
+                <xml-element java-attribute="sitePairId" name="site-pair-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique identifier of probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sourceIp" name="source-ip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="destinationIp" name="destination-ip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip version, v4, v6"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="destinationHostname" name="destination-hostname" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v23.ClassesOfService"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="site-pair-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="site-pair-id"/>
+                <xml-property name="dependentOn" value="routing-instance"/>
+                <xml-property name="container" value="site-pairs"/>
+                <xml-property name="uriTemplate" value="/site-pairs/site-pair/{site-pair-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ClassesOfService">
+            <xml-properties>
+                <xml-property name="description" value="class-of-service of probe"/>
+            </xml-properties>
+            <xml-root-element name="classes-of-service"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v23.ClassOfService"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ClassOfService">
+            <xml-root-element name="class-of-service"/>
+            <java-attributes>
+                <xml-element java-attribute="cos" name="cos" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique identifier of probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="probeId" name="probe-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="identifier of probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="probeType" name="probe-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="type of probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object captures data and voice protocols to differentiate the types of payloads contained in the packet being transmitted. | A&amp;AI clients for this object are typically: (DMaaP-DCAE,...) |"/>
+                <xml-property name="indexedProps" value="cos,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="site-pair"/>
+                <xml-property name="container" value="classes-of-service"/>
+                <xml-property name="uriTemplate" value="/classes-of-service/class-of-service/{cos}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VpnBindings">
+            <xml-root-element name="vpn-bindings"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v23.VpnBinding"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VpnBinding">
+            <xml-root-element name="vpn-binding"/>
+            <java-attributes>
+                <xml-element java-attribute="vpnId" name="vpn-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="VPN ID, globally unique within A&amp;AI"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnName" name="vpn-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="VPN Name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnRegion" name="vpn-region" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="region of customer vpn"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="customerVpnId" name="customer-vpn-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="id for this customer vpn"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPrefixV4" name="max-prefix-v4" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Max prefix for IPv4."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPrefixV6" name="max-prefix-v6" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Max prefix for IPv6."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPrefixThreshold" name="max-prefix-threshold" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Max prefix threshold."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="labelModeV4" name="label-mode-v4" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Label mode for IPv4."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="labelModeV6" name="label-mode-v6" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Label mode for IPv6."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnDescription" name="vpn-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The description of the vpn."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vxlanNetworkId" name="vxlan-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="A VNI associated with the VPN."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPath" name="max-path" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="A variable BGP max AS path length."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPathsV4" name="max-paths-v4" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="stores maximum number of paths for IPv4."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPathsV6" name="max-paths-v6" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="stores maximum number of paths for IPv6."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.onap.org.v23.RouteTargets"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList">
+                    <xml-properties>
+                        <xml-property name="description" value="l3-networks relate to vpn-bindings"/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="VPN binding"/>
+                <xml-property name="nameProps" value="vpn-name,vpn-type"/>
+                <xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="vpn-id"/>
+                <xml-property name="container" value="vpn-bindings"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vpn-bindings/vpn-binding/{vpn-id}"/>
+                <xml-property name="requiredProps" value="vpn-id,vpn-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VplsPes">
+            <xml-properties>
+                <xml-property name="description" value="Collection of VPLS Provider Edge routers"/>
+            </xml-properties>
+            <xml-root-element name="vpls-pes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v23.VplsPe"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VplsPe">
+            <xml-root-element name="vpls-pe"/>
+            <java-attributes>
+                <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true"/>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems. Valid values can be found at (https://wiki.web.att.com/display/SPTIIRP/prov-status)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Temporary location for stag to get to VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v23.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v23.LagInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="VPLS Provider Edge routers."/>
+                <xml-property name="indexedProps" value="prov-status,equipment-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="vpls-pes"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vpls-pes/vpls-pe/{equipment-name}"/>
+                <xml-property name="requiredProps" value="equipment-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="MulticastConfigurations">
+            <xml-properties>
+                <xml-property name="description" value="multicast configuration of generic-vnf ip-address"/>
+            </xml-properties>
+            <xml-root-element name="multicast-configurations"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v23.MulticastConfiguration"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="MulticastConfiguration">
+            <xml-root-element name="multicast-configuration"/>
+            <java-attributes>
+                <xml-element java-attribute="multicastConfigurationId" name="multicast-configuration-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of multicast configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="multicastProtocol" name="multicast-protocol" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="protocol of multicast configuration"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rpType" name="rp-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="rp type of multicast configuration"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object groups different VLANs that are on different logical interfaces on the same VNF. Multicast is the delivery of information to a group of destinations simultaneously, using the most efficient strategy to deliver messages over each link of the network only once, and create copies only when the links to the destinations split. | A&amp;AI clients for this object are typically: SDNC, (DMaaP-DCAE,...) |"/>
+                <xml-property name="indexedProps" value="multicast-configuration-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="multicast-configuration-id"/>
+                <xml-property name="container" value="multicast-configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/multicast-configurations/multicast-configuration/{multicast-configuration-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Vces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated."/>
+            </xml-properties>
+            <xml-root-element name="vces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v23.Vce"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Vce">
+            <xml-root-element name="vce"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternate name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems. Valid values can be found at (https://wiki.web.att.com/display/SPTIIRP/prov-status)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  do not use"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network role being played by this VNF"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of VPE connected to this VCE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Loopback0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  see child relationships"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v23.PortGroups"/>
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v23.Licenses"/>
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v23.Entitlements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated."/>
+                <xml-property name="nameProps" value="vnf-name"/>
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="container" value="vces"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="extends" value="vnf"/>
+                <xml-property name="uriTemplate" value="/network/vces/vce/{vnf-id}"/>
+                <xml-property name="requiredProps" value="vnf-id,vnf-name,vnf-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="PortGroups">
+            <xml-root-element name="port-groups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v23.PortGroup"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="PortGroup">
+            <xml-root-element name="port-group"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of this Interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network name of this Interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portGroupId" name="port-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID for port group in vmware"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Likely to duplicate value of neutron network name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="switchName" name="switch-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v23.CvlanTags"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
+                <xml-property name="nameProps" value="port-group-name"/>
+                <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="vce"/>
+                <xml-property name="container" value="port-groups"/>
+                <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
+                <xml-property name="requiredProps" value="interface-id,orchestration-status"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="CvlanTags">
+            <xml-root-element name="cvlan-tags"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v23.CvlanTagEntry"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="CvlanTagEntry">
+            <xml-root-element name="cvlan-tag-entry"/>
+            <java-attributes>
+                <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="See mis-na-virtualization-platform.yang"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="dependentOn" value="port-group"/>
+                <xml-property name="indexedProps" value="cvlan-tag,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="cvlan-tags"/>
+                <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag}"/>
+            </xml-properties>
+        </java-type>
+
+
+        <java-type name="Vnfcs">
+            <xml-properties>
+                <xml-property name="description" value="virtual network components associated with a vserver from application controller."/>
+            </xml-properties>
+            <xml-root-element name="vnfcs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v23.Vnfc"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Vnfc">
+            <xml-root-element name="vnfc"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of vnfc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfcNamingCode" name="nfc-naming-code" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Short code that is used in naming instances of the item being modeled"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfcFunction" name="nfc-function" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="prov status of this vnfc. Valid values can be found at (https://wiki.web.att.com/display/SPTIIRP/prov-status)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by APP-C"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Oam V4 vip address of this vnfc"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="groupNotation" name="group-notation" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group notation of VNFC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="cps" name="cps" type="inventory.aai.onap.org.v23.Cps"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v23.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v23.L3InterfaceIpv6AddressList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="vnfcs"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vnfcs/vnfc/{vnfc-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="L3Networks">
+            <xml-root-element name="l3-networks"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v23.L3Network"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="L3Network">
+            <xml-root-element name="l3-network"/>
+            <java-attributes>
+                <xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the network, governed by some naming convention.."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkType" name="network-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the network - who defines these values?"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkRole" name="network-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role the network plans - who defines these values?"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network technology - who defines these values?"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="text used for documentation"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of this Interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isBoundToVpn" name="is-bound-to-vpn" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Set to true if bound to VPN"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="network role instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Contrail FQDN for the network"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="internal"/>
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="physicalNetworkName" name="physical-network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name associated with the physical network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isProviderNetwork" name="is-provider-network" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is a provider network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isSharedNetwork" name="is-shared-network" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is a shared network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isExternalNetwork" name="is-external-network" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is an external network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Path to the controller object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isTrunked" name="is-trunked" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Trunked network indication."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkFunction" name="network-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The function performed by this l3 network"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v23.Subnets"/>
+                <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v23.CtagAssignments"/>
+                <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v23.SegmentationAssignments"/>
+                <xml-element java-attribute="aggregateRoutes" name="aggregate-routes" type="inventory.aai.onap.org.v23.AggregateRoutes"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList">
+                    <xml-properties>
+                        <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding"/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Generic network definition"/>
+                <xml-property name="nameProps" value="network-name"/>
+                <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,network-function,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="network-id"/>
+                <xml-property name="container" value="l3-networks"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/l3-networks/l3-network/{network-id}"/>
+                <xml-property name="requiredProps" value="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="NetworkPolicies">
+            <xml-root-element name="network-policies"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v23.NetworkPolicy"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="NetworkPolicy">
+            <xml-root-element name="network-policy"/>
+            <java-attributes>
+                <xml-element java-attribute="networkPolicyId" name="network-policy-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID representing unique key to this instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkPolicyFqdn" name="network-policy-fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Contrail FQDN for the policy"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID for the openStack Heat instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object captures the set of conditions, constraints, and settings that allow you to designate who is authorized to connect to the network and the circumstances under which they can or cannot connect. Provides Contrail FQDN for policy. | A&amp;AI clients for this object are typically: SDNC, AAI-tools, (DMaaP-DCAE,...) |"/>
+                <xml-property name="nameProps" value="network-policy-fqdn"/>
+                <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="network-policy-id"/>
+                <xml-property name="container" value="network-policies"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/network-policies/network-policy/{network-policy-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="CtagAssignments">
+            <xml-root-element name="ctag-assignments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v23.CtagAssignment"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="CtagAssignment">
+            <xml-root-element name="ctag-assignment"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" required="true" type="java.lang.Long" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="id."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="vlan-id-inner,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="ctag-assignments"/>
+                <xml-property name="uriTemplate" value="/ctag-assignments/ctag-assignment/{vlan-id-inner}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Subnets">
+            <xml-root-element name="subnets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v23.Subnet"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Subnet">
+            <xml-root-element name="subnet"/>
+            <java-attributes>
+                <xml-element java-attribute="subnetId" name="subnet-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Subnet ID, should be UUID."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name associated with the subnet."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of this subnet"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="gateway ip address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="network start address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="cidr mask"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="text used for documentation"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="dhcpEnabled" name="dhcp-enabled" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="dhcp enabled"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the start address reserved for use by dhcp"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the last address reserved for use by dhcp"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnetRole" name="subnet-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role of the subnet, referenced when assigning IPs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnetModel" name="subnet-model" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="subnet model BGP, VRPP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnetType" name="subnet-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Subtype used to categorize this physical link"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnetFunction" name="subnet-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The function performed by this Linterface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipAssignmentDirection" name="ip-assignment-direction" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip address assignment direction of the subnet"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnetSequence" name="subnet-sequence" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="sequence of the subnet"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hostRoutes" name="host-routes" type="inventory.aai.onap.org.v23.HostRoutes"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v23.IpAddressList"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="bgpNeighbors" name="bgp-neighbors" type="inventory.aai.onap.org.v23.BgpNeighbors"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="subnet-id,subnet-name,subnet-type,subnet-function,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="subnet-name"/>
+                <xml-property name="uniqueProps" value="subnet-id"/>
+                <xml-property name="dependentOn" value="l3-network,zone"/>
+                <xml-property name="container" value="subnets"/>
+                <xml-property name="uriTemplate" value="/subnets/subnet/{subnet-id}"/>
+                <xml-property name="requiredProps" value="subnet-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="GenericVnfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of VNFs"/>
+            </xml-properties>
+            <xml-root-element name="generic-vnfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v23.GenericVnf"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="GenericVnf">
+            <xml-root-element name="generic-vnf"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName" name="vnf-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternate name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems. Valid values can be found at (https://wiki.web.att.com/display/SPTIIRP/prov-status)."/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path."/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  do not use"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Client should send valid enumerated value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, used by MSO."/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="identifier of managed by ATT or customer"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v4 Loopback0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nmLanV6Address" name="nm-lan-v6-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v6 Loopback address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementV6Address" name="management-v6-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v6 management address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vcpuUnits" name="vcpu-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vmemory" name="vmemory" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vmemoryUnits" name="vmemory-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vdisk" name="vdisk" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vdiskUnits" name="vdisk-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="summaryStatus" name="summary-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates whether generic-vnf access uses SSH"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="entitlementAssignmentGroupUuid" name="entitlement-assignment-group-uuid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the Entitlement group used for licensing VNFs, OBSOLETE -  See child relationships."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the specific entitlement resource.  OBSOLETE -  See child relationships."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseAssignmentGroupUuid" name="license-assignment-group-uuid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the license assignment group.  OBSOLETE -  See child relationships."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKeyUuid" name="license-key-uuid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the actual license resource.  OBSOLETE -  See child relationships."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="internal"/>
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="asNumber" name="as-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="as-number of the VNF"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="regionalResourceSubzone" name="regional-resource-subzone" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="represents sub zone of the rr plane"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfType" name="nf-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Generic description of the type of NF"/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfFunction" name="nf-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="English description of Network function that the specific VNF deployment is providing"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role in the network that this model will be providing"/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfNamingCode" name="nf-naming-code" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="string assigned to this model used for naming purposes"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Path to the controller object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Gateway address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length for oam-address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Temporary location for S-TAG to get to VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nmProfileName" name="nm-profile-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network Management profile of this VNF"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="softwareVersion" name="software-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="VNF instance specific software version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationId" name="application-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="vnf application-id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v23.LInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v23.LagInterfaces"/>
+                <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v23.VfModules"/>
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v23.Licenses"/>
+                <xml-element java-attribute="bgpGroups" name="bgp-groups" type="inventory.aai.onap.org.v23.BgpGroups"/>
+                <xml-element java-attribute="bgpNeighbors" name="bgp-neighbors" type="inventory.aai.onap.org.v23.BgpNeighbors"/>
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v23.Entitlements"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose VNF"/>
+                <xml-property name="nameProps" value="vnf-name"/>
+                <xml-property name="indexedProps" value="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role,nm-profile-name,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="container" value="generic-vnfs"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="extends" value="vnf"/>
+                <xml-property name="containsSuggestibleProps" value="true"/>
+                <xml-property name="suggestionAliases" value="VNFs"/>
+                <xml-property name="uriTemplate" value="/network/generic-vnfs/generic-vnf/{vnf-id}"/>
+                <xml-property name="requiredProps" value="vnf-id,vnf-type,in-maint,is-closed-loop-disabled"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VfModules">
+            <xml-properties>
+                <xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs"/>
+            </xml-properties>
+            <xml-root-element name="vf-modules"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v23.VfModule"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VfModule">
+            <xml-root-element name="vf-module"/>
+            <java-attributes>
+                <xml-element java-attribute="vfModuleId" name="vf-module-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of vf-module."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of vf-module"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="orchestration status of this vf-module, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isBaseVfModule" name="is-base-vf-module" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is base vf module"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="automatedAssignment" name="automated-assignment" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Indicates whether vf-module assignment was done via automation or manually"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="internal"/>
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the Contrail unique ID for a service-instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="moduleIndex" name="module-index" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Path to the controller object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="a deployment unit of VNFCs"/>
+                <xml-property name="indexedProps" value="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="generic-vnf"/>
+                <xml-property name="container" value="vf-modules"/>
+                <xml-property name="uriTemplate" value="/vf-modules/vf-module/{vf-module-id}"/>
+                <xml-property name="requiredProps" value="vf-module-id,is-base-vf-module,automated-assignment"/>
+            </xml-properties>
+        </java-type>
+
+
+        <java-type name="LagLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of link aggregation connections"/>
+            </xml-properties>
+            <xml-root-element name="lag-links"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v23.LagLink"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LagLink">
+            <xml-root-element name="lag-link"/>
+            <java-attributes>
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Alphabetical concatenation of lag-interface names"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="LAG links can connect lag-interfaces"/>
+                <xml-property name="indexedProps" value="link-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="lag-links"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/lag-links/lag-link/{link-name}"/>
+                <xml-property name="requiredProps" value="link-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Newvces">
+            <xml-properties>
+                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
+            </xml-properties>
+            <xml-root-element name="newvces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v23.Newvce"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Newvce">
+            <xml-root-element name="newvce"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternate name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems. Valid values can be found at (https://wiki.web.att.com/display/SPTIIRP/prov-status)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  do not use"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Client should send valid enumerated value."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v4 Loopback0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v23.LInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
+                <xml-property name="nameProps" value="vnf-name"/>
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="vnf-id2"/>
+                <xml-property name="container" value="newvces"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/newvces/newvce/{vnf-id2}"/>
+                <xml-property name="requiredProps" value="vnf-id2,vnf-name,vnf-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Pnfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Physical Network Functions."/>
+            </xml-properties>
+            <xml-root-element name="pnfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v23.Pnf"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Pnf">
+            <xml-root-element name="pnf"/>
+            <java-attributes>
+                <xml-element java-attribute="pnfName" name="pnf-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique name of Physical Network Function."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="name of Physical Network Function."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="source of name2"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="id of pnf"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfNamingCode" name="nf-naming-code" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Naming code for network function"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkOperatingSystem" name="network-operating-system" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network operating system used on the device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfFunction" name="nf-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The function performed by the pnf."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="identifier of managed by ATT or customer"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this pnf"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="frameId" name="frame-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Serial number of the device"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 OAM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="spareEquipmentIndicator" name="spare-equipment-indicator" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Flag for identifying spare equipment"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of this device (not under canopi control). Valid values can be found at (https://wiki.web.att.com/display/SPTIIRP/prov-status)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Nf Role is the role performed by this instance in the network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The ASDC model id for this resource  model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The ASDC model version for this resource  model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configValidationRequestId" name="config-validation-request-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Contains the value of the request id to the most recent configuration file/validation report for this PNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configValidationStatus" name="config-validation-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Status of latest configuration attempt represented by the config-url."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfType" name="nf-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Subtype used to categorize this pnf"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="commonBaseIndicator" name="common-base-indicator" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the PNF/R-Leaf was built with the VNF agnostic common base"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentClli" name="equipment-clli" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="11-character equipment CLLI."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="phoneNumber" name="phone-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the POTS phone number used to connect to a pnf out-of-band via dial-up."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v23.PInterfaces"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v23.LInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v23.LagInterfaces"/>
+                <xml-element java-attribute="activities" name="activities" type="inventory.aai.onap.org.v23.Activities"/>
+                <xml-element java-attribute="vrfs" name="vrfs" type="inventory.aai.onap.org.v23.Vrfs"/>
+                <xml-element java-attribute="bgpGroups" name="bgp-groups" type="inventory.aai.onap.org.v23.BgpGroups"/>
+                <xml-element java-attribute="bgpNeighbors" name="bgp-neighbors" type="inventory.aai.onap.org.v23.BgpNeighbors"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE."/>
+                <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id,nf-type,nf-role,prov-status,nf-naming-code,equipment-clli,phone-number,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="pnf-name"/>
+                <xml-property name="container" value="pnfs"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/pnfs/pnf/{pnf-name}"/>
+                <xml-property name="requiredProps" value="pnf-name,in-maint"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Chassies">
+            <xml-root-element name="chassies"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="chassis" name="chassis" type="inventory.aai.onap.org.v23.Chassis"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Chassis">
+            <xml-root-element name="chassis"/>
+            <java-attributes>
+                <xml-element java-attribute="chassisName" name="chassis-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="A globally unique name for the chassis."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="chassisType" name="chassis-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The type of chassis.."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="chassisRole" name="chassis-role" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The role of the chassis relative to the pnf/pserver.."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operatingSystem" name="operating-system" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operating system of the hardware."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The serial number of the chassis.."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="assetTag" name="asset-tag" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The asset tag of the chassis."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="chassisDescription" name="chassis-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description of the chassis."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="partNumber" name="part-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Part number for this chassis."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this chassis."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment model."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment vendor. Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipIdentifier" name="equip-identifier" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CLEI or other specification for chassis hardware."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="slotNumber" name="slot-number" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Slot number associated with this chassis."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="adminState" name="admin-state" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Reflects the admin-state of the device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ports" name="ports" type="inventory.aai.onap.org.v23.Ports"/>
+                <xml-element java-attribute="cardSlots" name="card-slots" type="inventory.aai.onap.org.v23.CardSlots"/>
+                <xml-element java-attribute="pluggableSlots" name="pluggable-slots" type="inventory.aai.onap.org.v23.PluggableSlots"/>
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v23.Licenses"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of chassis"/>
+                <xml-property name="uniqueProps" value="chassis-name"/>
+                <xml-property name="indexedProps" value="chassis-name,part-number,orchestration-status,equip-model,equip-vendor,equip-identifier,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="chassies"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/chassies/chassis/{chassis-name}"/>
+                <xml-property name="requiredProps" value="chassis-name,chassis-type,chassis-role"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Ports">
+            <xml-root-element name="ports"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="port" name="port" type="inventory.aai.onap.org.v23.Port"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Port">
+            <xml-root-element name="port"/>
+            <java-attributes>
+                <xml-element java-attribute="portName" name="port-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="A unique name for the port relative to the containing hardware."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portType" name="port-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The type of port."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portRole" name="port-role" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The role of the port."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The numeric value for the speed of the port."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The units for the speed of the port."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="xcvrType" name="xcvr-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of transceiver that creates this port."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipIdentifier" name="equip-identifier" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="clei-code or other similar identifier"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="partNumber" name="part-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="part number"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portStart" name="port-start" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Port range start"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portEnd" name="port-end" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Port range end"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of port"/>
+                <xml-property name="indexedProps" value="port-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="chassis,pluggable,card"/>
+                <xml-property name="container" value="ports"/>
+                <xml-property name="uriTemplate" value="/ports/port/{port-name}"/>
+                <xml-property name="requiredProps" value="port-name,port-type,port-role,speed-value,speed-units"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="CardSlots">
+            <xml-root-element name="card-slots"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cardSlot" name="card-slot" type="inventory.aai.onap.org.v23.CardSlot"/>
+            </java-attributes>
+            <xml-properties>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="CardSlot">
+            <xml-root-element name="card-slot"/>
+            <java-attributes>
+                <xml-element java-attribute="slotName" name="slot-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="The name of the card-slot (unique relative to the chassis)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cards" name="cards" type="inventory.aai.onap.org.v23.Cards"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of card-slot"/>
+                <xml-property name="indexedProps" value="slot-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="chassis"/>
+                <xml-property name="container" value="card-slots"/>
+                <xml-property name="uriTemplate" value="/card-slots/card-slot/{slot-name}"/>
+                <xml-property name="requiredProps" value="slot-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Cards">
+            <xml-root-element name="cards"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="card" name="card" type="inventory.aai.onap.org.v23.Card"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Card">
+            <xml-root-element name="card"/>
+            <java-attributes>
+                <xml-element java-attribute="cardType" name="card-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="The type of card."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="ports" name="ports" type="inventory.aai.onap.org.v23.Ports"/>
+                <xml-element java-attribute="pluggableSlots" name="pluggable-slots" type="inventory.aai.onap.org.v23.PluggableSlots"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of card"/>
+                <xml-property name="indexedProps" value="card-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="card-slot"/>
+                <xml-property name="container" value="cards"/>
+                <xml-property name="uriTemplate" value="/cards/card/{card-type}"/>
+                <xml-property name="requiredProps" value="card-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="PluggableSlots">
+            <xml-root-element name="pluggable-slots"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pluggableSlot" name="pluggable-slot" type="inventory.aai.onap.org.v23.PluggableSlot"/>
+            </java-attributes>
+            <xml-properties>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="PluggableSlot">
+            <xml-root-element name="pluggable-slot"/>
+            <java-attributes>
+                <xml-element java-attribute="slotName" name="slot-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="The name of the pluggable-slot. (unique relative to the chassis or card)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pluggables" name="pluggables" type="inventory.aai.onap.org.v23.Pluggables"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of card-slot"/>
+                <xml-property name="indexedProps" value="slot-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="chassis,card"/>
+                <xml-property name="container" value="pluggable-slots"/>
+                <xml-property name="uriTemplate" value="/pluggable-slots/pluggable-slot/{slot-name}"/>
+                <xml-property name="requiredProps" value="slot-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Pluggables">
+            <xml-root-element name="pluggables"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pluggable" name="pluggable" type="inventory.aai.onap.org.v23.Pluggable"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Pluggable">
+            <xml-root-element name="pluggable"/>
+            <java-attributes>
+                <xml-element java-attribute="pluggableType" name="pluggable-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="The type of pluggable."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="partNumber" name="part-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Part number for this pluggable."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipIdentifier" name="equip-identifier" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CLEI or other specification for pluggable hardware."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="ports" name="ports" type="inventory.aai.onap.org.v23.Ports"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of pluggable"/>
+                <xml-property name="indexedProps" value="pluggable-type,part-number,equip-identifier,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="pluggable-slot"/>
+                <xml-property name="container" value="pluggables"/>
+                <xml-property name="uriTemplate" value="/pluggables/pluggable/{pluggable-type}"/>
+                <xml-property name="requiredProps" value="pluggable-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="PhysicalLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
+            </xml-properties>
+            <xml-root-element name="physical-links"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v23.PhysicalLink"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="PhysicalLink">
+            <xml-root-element name="physical-link"/>
+            <java-attributes>
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit it"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Dual access mode (e.g., primary, secondary"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the service Provider on this link."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthUpValue" name="service-provider-bandwidth-up-value" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Upstream Bandwidth value agreed with the service provider"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthUpUnits" name="service-provider-bandwidth-up-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Units for the upstream BW value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthDownValue" name="service-provider-bandwidth-down-value" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Downstream Bandwidth value agreed with the service provider"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthDownUnits" name="service-provider-bandwidth-down-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Units for downstream BW value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkFunction" name="link-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The function performed by this physical link"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for the use of this physical link"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkType" name="link-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Subtype used to categorize this physical link"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
+                <xml-property name="indexedProps" value="circuit-id,link-name,link-function,link-role,link-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="alternateKeys1" value="circuit-id"/>
+                <xml-property name="container" value="physical-links"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/physical-links/physical-link/{link-name}"/>
+                <xml-property name="requiredProps" value="link-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VigServers">
+            <xml-root-element name="vig-servers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v23.VigServer"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VigServer">
+            <xml-root-element name="vig-server"/>
+            <java-attributes>
+                <xml-element java-attribute="vigAddressType" name="vig-address-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v4 IP of the vig server"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v6 IP of the vig server"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object captures information about a vig server used for IPSec-configuration. Populated by SDN-C | A&amp;AI clients for this object are typically: SDNC, (DMaaP-DCAE,...) |"/>
+                <xml-property name="indexedProps" value="vig-address-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="ipsec-configuration"/>
+                <xml-property name="container" value="vig-servers"/>
+                <xml-property name="uriTemplate" value="/vig-servers/vig-server/{vig-address-type}"/>
+                <xml-property name="requiredProps" value="vig-address-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="IpsecConfigurations">
+            <xml-root-element name="ipsec-configurations"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v23.IpsecConfiguration"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="IpsecConfiguration">
+            <xml-root-element name="ipsec-configuration"/>
+            <java-attributes>
+                <xml-element java-attribute="ipsecConfigurationId" name="ipsec-configuration-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of this configuration"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedVigAddressType" name="requested-vig-address-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedEncryptionStrength" name="requested-encryption-strength" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ATT can offer a shared DMZ or a DMZ specific to a customer"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network address of shared DMZ"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedCustomerName" name="requested-customer-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikeVersion" name="ike-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="can be 1 or 2"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1Authentication" name="ikev1-authentication" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Contains values like md5, sha1, sha256, sha384"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1AmGroupId" name="ikev1-am-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group name defined in VIG for clients using aggressive mode"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1AmPassword" name="ikev1-am-password" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="pre-shared key for the above group name "/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1SaLifetime" name="ikev1-sa-lifetime" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Lifetime for IKEv1 SA"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecAuthentication" name="ipsec-authentication" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="md5, sha1, sha256, sha384"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Life time for IPSec SA"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecPfs" name="ipsec-pfs" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="enable PFS or not"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="user ID for xAuth, sm-user,ucpeHostName,nmteHostName"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encrypted using the Juniper $9$ algorithm"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dpdInterval" name="dpd-interval" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The time between DPD probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dpdFrequency" name="dpd-frequency" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v23.VigServers"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C"/>
+                <xml-property name="indexedProps" value="ipsec-configuration-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="ipsec-configuration-id"/>
+                <xml-property name="container" value="ipsec-configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}"/>
+                <xml-property name="requiredProps" value="ipsec-configuration-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Models">
+            <xml-properties>
+                <xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models"/>
+            </xml-properties>
+            <xml-root-element name="models"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v23.Model"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Model">
+            <xml-root-element name="model"/>
+            <xml-properties>
+                <xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version"/>
+                <xml-property name="nameProps" value="model-type"/>
+                <xml-property name="indexedProps" value="model-invariant-id,model-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="model-invariant-id"/>
+                <xml-property name="container" value="models"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/models/model/{model-invariant-id}"/>
+                <xml-property name="requiredProps" value="model-invariant-id,model-type"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v23.ModelVers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+
+        <java-type name="ModelVers">
+            <xml-root-element name="model-vers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v23.ModelVer"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ModelVer">
+            <xml-root-element name="model-ver"/>
+            <xml-properties>
+                <xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models"/>
+                <xml-property name="nameProps" value="model-name"/>
+                <xml-property name="indexedProps" value="model-version-id,model-name,model-version,distribution-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="model-version-id"/>
+                <xml-property name="dependentOn" value="model"/>
+                <xml-property name="container" value="model-vers"/>
+                <xml-property name="uriTemplate" value="/model-vers/model-ver/{model-version-id}"/>
+                <xml-property name="requiredProps" value="model-version-id,model-name,model-version"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the model, which can change from version to version."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="distributionStatus" name="distribution-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Distribution Status"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v23.ModelElements"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v23.Metadata"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ModelElements">
+            <xml-root-element name="model-elements"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v23.ModelElement"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ModelElement">
+            <xml-properties>
+                <xml-property name="description" value="Defines how other models combine to make up a higher-level model."/>
+                <xml-property name="uniqueProps" value="model-element-uuid"/>
+                <xml-property name="indexedProps" value="model-element-uuid,data-owner,data-source,data-source-version"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="dependentOn" value="element-choice-set,model-element,model-ver"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="model-elements"/>
+                <xml-property name="uriTemplate" value="/model-elements/model-element/{model-element-uuid}"/>
+                <xml-property name="requiredProps" value="model-element-uuid,new-data-del-flag,cardinality"/>
+            </xml-properties>
+            <xml-root-element name="model-element"/>
+            <java-attributes>
+                <xml-element java-attribute="modelElementUuid" name="model-element-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="newDataDelFlag" name="new-data-del-flag" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cardinality" name="cardinality" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="How many of this type of element are required/allowed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String">
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v23.ModelElements">
+                    <xml-properties>
+                        <xml-property name="description" value="Defines how other models combine to make up a higher-level model"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v23.ModelConstraints">
+                    <xml-properties>
+                        <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ModelConstraints">
+            <xml-root-element name="model-constraints"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v23.ModelConstraint"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ModelConstraint">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="model-constraint-uuid"/>
+                <xml-property name="indexedProps" value="model-constraint-uuid,data-owner,data-source,data-source-version"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="dependentOn" value="model-element"/>
+                <xml-property name="container" value="model-constraints"/>
+                <xml-property name="uriTemplate" value="/model-constraints/model-constraint/{model-constraint-uuid}"/>
+                <xml-property name="requiredProps" value="model-constraint-uuid,constrained-element-set-uuid-to-replace"/>
+            </xml-properties>
+            <xml-root-element name="model-constraint"/>
+            <java-attributes>
+                <xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v23.ConstrainedElementSets"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ConstrainedElementSets">
+            <xml-root-element name="constrained-element-sets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v23.ConstrainedElementSet"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ConstrainedElementSet">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="constrained-element-set-uuid"/>
+                <xml-property name="indexedProps" value="constrained-element-set-uuid,data-owner,data-source,data-source-version"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="dependentOn" value="model-constraint,model-element"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="constrained-element-sets"/>
+                <xml-property name="uriTemplate" value="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}"/>
+                <xml-property name="requiredProps" value="constrained-element-set-uuid,constraint-type,check-type"/>
+            </xml-properties>
+            <xml-root-element name="constrained-element-set"/>
+            <java-attributes>
+                <xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v23.ElementChoiceSets"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ElementChoiceSets">
+            <xml-root-element name="element-choice-sets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v23.ElementChoiceSet"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ElementChoiceSet">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="element-choice-set-uuid"/>
+                <xml-property name="indexedProps" value="element-choice-set-uuid,data-owner,data-source,data-source-version"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="dependentOn" value="constrained-element-set"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="element-choice-sets"/>
+                <xml-property name="uriTemplate" value="/element-choice-sets/element-choice-set/{element-choice-set-uuid}"/>
+                <xml-property name="requiredProps" value="element-choice-set-uuid,element-choice-set-name"/>
+            </xml-properties>
+            <xml-root-element name="element-choice-set"/>
+            <java-attributes>
+                <xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v23.ModelElements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="OverloadedModel">
+            <xml-root-element name="overloaded-model"/>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object allows for legacy POST of old-style and new-style models | A&amp;AI clients for this object are typically: (DMaaP-DCAE,...) |"/>
+                <xml-property name="requiredProps" value="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelNameVersionId" name="model-name-version-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the model, which can change from version to version."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelId" name="model-id" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Invariant unique ID which does not change from version to version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v23.ModelVers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RouteTableReferences">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack route table references"/>
+            </xml-properties>
+            <xml-root-element name="route-table-references"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v23.RouteTableReference"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RouteTableReference">
+            <xml-root-element name="route-table-reference"/>
+            <java-attributes>
+                <xml-element java-attribute="routeTableReferenceId" name="route-table-reference-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routeTableReferenceFqdn" name="route-table-reference-fqdn" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="FQDN entry in the route table."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object captures the openstack route table reference. | A&amp;AI clients for this object are typically: (DMaaP-DCAE,...) |"/>
+                <xml-property name="nameProps" value="route-table-reference-fqdn"/>
+                <xml-property name="uniqueProps" value="route-table-reference-id"/>
+                <xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="route-table-references"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/route-table-references/route-table-reference/{route-table-reference-id}"/>
+                <xml-property name="requiredProps" value="route-table-reference-id,route-table-reference-fqdn"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="InstanceGroups">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack route table references"/>
+            </xml-properties>
+            <xml-root-element name="instance-groups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v23.InstanceGroup"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="InstanceGroup">
+            <xml-root-element name="instance-group"/>
+            <java-attributes>
+
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Instance Group ID, UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="instanceGroupRole" name="instance-group-role" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role of the instance group."/>
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="modelVersionId" name="model-version-id" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ASDC model version uid for this resource model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Descriptive text to help identify the usage of this instance-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="instanceGroupType" name="instance-group-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Only valid value today is lower case ha for high availability"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="instanceGroupName" name="instance-group-name" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Instance-Group Name."/>
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="instanceGroupFunction" name="instance-group-function" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Instance-Group Function"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="instanceGroupNumber" name="instance-group-number" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Number used to identify an instance-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="priorityNumber" name="priority-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to identify the primary and secondary priority"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object is used for grouping instances. | A&amp;AI clients for this object are typically: AUTOGEN, CONDUCTOR, CVAAS, DCAE-CCS, GEOLINK, NLS, PINC, SO.BPMN; GEOLINK, NBO, SDN-GC, (DMaaP-DCAE,...) | "/>
+                <xml-property name="nameProps" value="description,instance-group-name"/>
+                <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="instance-groups"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
+                <xml-property name="requiredProps" value="id,instance-group-type"/>
+            </xml-properties>
+        </java-type>
+
+
+        <java-type name="SegmentationAssignments">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack segmentation assignments"/>
+            </xml-properties>
+            <xml-root-element name="segmentation-assignments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v23.SegmentationAssignment"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SegmentationAssignment">
+            <xml-root-element name="segmentation-assignment"/>
+            <java-attributes>
+                <xml-element java-attribute="segmentationId" name="segmentation-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object captures the openstack segmentation assignment. | A&amp;AI clients for this object are typically: SDNC, (DMaaP-DCAE,...) |"/>
+                <xml-property name="indexedProps" value="segmentation-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="segmentation-assignments"/>
+                <xml-property name="uriTemplate" value="/segmentation-assignments/segmentation-assignment/{segmentation-id}"/>
+                <xml-property name="requiredProps" value="segmentation-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="AllottedResources">
+            <xml-properties>
+                <xml-property name="description" value="This object is used to store slices of services being offered"/>
+            </xml-properties>
+            <xml-root-element name="allotted-resources"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v23.AllottedResource"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="AllottedResource">
+            <xml-root-element name="allotted-resource"/>
+            <java-attributes>
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The descriptive information assigned to this allotted resource instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Link back to more information in the controller"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="type" name="type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Generic description of the type of allotted resource."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="role" name="role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role in the network that this resource will be providing."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v23.TunnelXconnects"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+
+            <xml-properties>
+                <xml-property name="description" value="Represents a slice or partial piece of a resource that gets separately allotted"/>
+                <xml-property name="nameProps" value="description"/>
+                <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,type,role,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="service-instance"/>
+                <xml-property name="container" value="allotted-resources"/>
+                <!--  <xml-property name="namespace" value="network" /> -->
+                <xml-property name="uriTemplate" value="/allotted-resources/allotted-resource/{id}"/>
+                <xml-property name="requiredProps" value="id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="TunnelXconnects">
+            <xml-properties>
+                <xml-property name="description" value="This object is used to store the specific tunnel cross connect aspects of an allotted resource"/>
+            </xml-properties>
+            <xml-root-element name="tunnel-xconnects"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v23.TunnelXconnect"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="TunnelXconnect">
+            <xml-root-element name="tunnel-xconnect"/>
+            <java-attributes>
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+
+            <xml-properties>
+                <xml-property name="description" value="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted"/>
+                <xml-property name="indexedProps" value="id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="allotted-resource"/>
+                <xml-property name="container" value="tunnel-xconnects"/>
+                <!--  <xml-property name="namespace" value="network" /> -->
+                <xml-property name="uriTemplate" value="/tunnel-xconnects/tunnel-xconnect/{id}"/>
+                <xml-property name="requiredProps" value="id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="BgpGroups">
+            <xml-root-element name="bgp-groups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="bgpGroup" name="bgp-group" type="inventory.aai.onap.org.v23.BgpGroup"/>
+            </java-attributes>
+            <xml-properties>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="BgpGroup">
+            <xml-root-element name="bgp-group"/>
+            <java-attributes>
+                <xml-element java-attribute="bgpGroupId" name="bgp-group-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bgpGroupName" name="bgp-group-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="name of bgp-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bgpGroupType" name="bgp-group-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="type of bgp-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bgpGroupRole" name="bgp-group-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role of bgp-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bgpGroupFunction" name="bgp-group-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="function of bgp-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="localAs" name="local-as" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="local a-s number type of vrf (bridge-domain as an example)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="localAddress" name="local-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="local address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="peerAs" name="peer-as" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="peer a-s number"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="peerAddress" name="peer-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="peer address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="description of bgp-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="addressFamilies" name="address-families" type="inventory.aai.onap.org.v23.AddressFamilies"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of bgp-group"/>
+                <xml-property name="indexedProps" value="bgp-group-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="pnf,vrf,generic-vnf"/>
+                <xml-property name="nameProps" value="bgp-group-id,bgp-group-name"/>
+                <xml-property name="container" value="bgp-groups"/>
+                <xml-property name="uriTemplate" value="/bgp-groups/bgp-group/{bgp-group-id}"/>
+                <xml-property name="requiredProps" value="bgp-group-id,bgp-group-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="BgpNeighbors">
+            <xml-root-element name="bgp-neighbors"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="bgpNeighbor" name="bgp-neighbor" type="inventory.aai.onap.org.v23.BgpNeighbor"/>
+            </java-attributes>
+            <xml-properties>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="BgpNeighbor">
+            <xml-root-element name="bgp-neighbor"/>
+            <java-attributes>
+                <xml-element java-attribute="bgpNeighborId" name="bgp-neighbor-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bgpNeighborType" name="bgp-neighbor-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="name of bgp-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bgpNeighborRole" name="bgp-neighbor-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="type of bgp-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bgpNeighborFunction" name="bgp-neighbor-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role of bgp-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="localAs" name="local-as" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="local a-s number type of vrf (bridge-domain as an example)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="localAddress" name="local-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="local address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="peerAs" name="peer-as" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="peer a-s number"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="peerAddress" name="peer-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="peer address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="description of bgp-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="provisioning status. Valid values can be found at (https://wiki.web.att.com/display/SPTIIRP/prov-status)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="peerHostname" name="peer-hostname" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="hostname of the peer"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="addressFamilies" name="address-families" type="inventory.aai.onap.org.v23.AddressFamilies"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of bgp-neighbor"/>
+                <xml-property name="indexedProps" value="bgp-neighbor-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="pnf,vrf,subnet,generic-vnf"/>
+                <xml-property name="nameProps" value="bgp-neighbor-id"/>
+                <xml-property name="container" value="bgp-neighbors"/>
+                <xml-property name="uriTemplate" value="/bgp-neighbors/bgp-neighbor/{bgp-neighbor-id}"/>
+                <xml-property name="requiredProps" value="bgp-neighbor-id,bgp-neighbor-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="AddressFamilies">
+            <xml-root-element name="address-families"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="addressFamily" name="address-family" type="inventory.aai.onap.org.v23.AddressFamily"/>
+            </java-attributes>
+            <xml-properties>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="AddressFamily">
+            <xml-root-element name="address-family"/>
+            <java-attributes>
+                <xml-element java-attribute="addressFamilyId" name="address-family-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="address family UUID."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="afType" name="af-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="address family type (aka afi)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="afSubtype" name="af-subtype" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="address family subtype (aka safi)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="afRole" name="af-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role of address-family"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="afFunction" name="af-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="function of address-family"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPrefixV4" name="max-prefix-v4" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Max prefix for IPv4"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPrefixV6" name="max-prefix-v6" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Max prefix for IPv6"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPrefixThreshold" name="max-prefix-threshold" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Max prefix threshold"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of address family"/>
+                <xml-property name="indexedProps" value="address-family-id,af-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="address-family-id,af-type"/>
+                <xml-property name="dependentOn" value="bgp-group,bgp-neighbor"/>
+                <xml-property name="container" value="address-families"/>
+                <xml-property name="uriTemplate" value="/address-families/address-family/{address-family-id}"/>
+                <xml-property name="requiredProps" value="address-family-id,af-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Entitlements">
+            <xml-properties>
+                <xml-property name="description" value="Entitlements, keyed by group-uuid and resource-uuid, related to license management"/>
+            </xml-properties>
+            <xml-root-element name="entitlements"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v23.Entitlement"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Entitlement">
+            <xml-root-element name="entitlement"/>
+            <java-attributes>
+                <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of an entitlement resource. "/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Metadata for entitlement group."/>
+                <xml-property name="indexedProps" value="group-uuid,resource-uuid,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="generic-vnf,vce"/>
+                <xml-property name="container" value="entitlements"/>
+                <xml-property name="uriTemplate" value="/entitlements/entitlement/{group-uuid}/{resource-uuid}"/>
+                <xml-property name="requiredProps" value="group-uuid,resource-uuid"/>
+            </xml-properties>
+        </java-type>
+
+
+        <java-type name="Licenses">
+            <xml-properties>
+                <xml-property name="description" value="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management"/>
+            </xml-properties>
+            <xml-root-element name="licenses"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v23.License"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="License">
+            <xml-root-element name="license"/>
+            <java-attributes>
+                <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of a license resource. "/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="projectNumber" name="project-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to store CFAS or other project numbers."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orderNumber" name="order-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Order number."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="receiptDate" name="receipt-date" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Date of receipt."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Metadata for license group."/>
+                <xml-property name="indexedProps" value="group-uuid,resource-uuid,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="chassis,generic-vnf,vce"/>
+                <xml-property name="container" value="licenses"/>
+                <xml-property name="uriTemplate" value="/licenses/license/{group-uuid}/{resource-uuid}"/>
+                <xml-property name="requiredProps" value="group-uuid,resource-uuid"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Vnf">
+            <xml-root-element name="vnf"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Abstract vnf class"/>
+                <xml-property name="indexedProps" value="vnf-id"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="inheritors" value="vce,generic-vnf"/>
+                <xml-property name="abstract" value="true"/>
+                <xml-property name="requiredProps" value="vnf-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Zones">
+            <xml-properties>
+                <xml-property name="description" value="Collection of zones"/>
+            </xml-properties>
+            <xml-root-element name="zones"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v23.Zone"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Zone">
+            <xml-root-element name="zone"/>
+            <java-attributes>
+                <xml-element java-attribute="zoneId" name="zone-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Code assigned by AIC to the zone"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="zoneName" name="zone-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="English name associated with the zone"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="zoneType" name="zone-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The type of zone (ex. AIC or NC)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Design of zone [Medium/Large…]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Context of zone [production/test]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="status" name="status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Status of a zone."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="zoneRole" name="zone-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role of a zone."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="zoneFunction" name="zone-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Function of a zone."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Used to indicate whether or not zone object is in maintenance mode."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="subnets" name="subnet" type="inventory.aai.onap.org.v23.Subnets"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object captures the grouping of assets in a location homing to the same connections into the CBB. Multiple complexes, cloud-regions are located in a zone. zone-id is a 4 alphanumeric char string. | A&amp;AI clients for this object are typically: AUTOGEN, CDM/NLS, CVAAS, DCAE-CCS, PINC, SDN-O, VID, IDF, (DMaaP-DCAE,...) |"/>
+                <xml-property name="nameProps" value="zone-name"/>
+                <xml-property name="indexedProps" value="zone-id,design-type,zone-context,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="zone-id"/>
+                <xml-property name="container" value="zones"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/zones/zone/{zone-id}"/>
+                <xml-property name="requiredProps" value="zone-id,zone-name,design-type,zone-context,in-maint"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="AutonomousSystems">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Autonomous Systems"/>
+            </xml-properties>
+            <xml-root-element name="autonomous-systems"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="autonomousSystem" name="autonomous-system" type="inventory.aai.onap.org.v23.AutonomousSystem"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="AutonomousSystem">
+            <xml-root-element name="autonomous-system"/>
+            <java-attributes>
+                <xml-element java-attribute="autonomousSystemId" name="autonomous-system-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="autonomousSystemNumber" name="autonomous-system-number" required="true" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="asn in the range of 0 to 9223372036854775807"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="autonomousSystemType" name="autonomous-system-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="type (global vs. local)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="autonomousSystemRegion" name="autonomous-system-region" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="geographic region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="autonomousSystemRole" name="autonomous-system-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role of autonomous system"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Description of Autonomous System"/>
+                <xml-property name="nameProps" value="autonomous-system-id,autonomous-system-number"/>
+                <xml-property name="indexedProps" value="autonomous-system-id,autonomous-system-number,autonomous-system-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="autonomous-system-id"/>
+                <xml-property name="container" value="autonomous-systems"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/autonomous-systems/autonomous-system/{autonomous-system-id}"/>
+                <xml-property name="requiredProps" value="autonomous-system-id,autonomous-system-number,autonomous-system-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="NetworkRanges">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Network Ranges"/>
+            </xml-properties>
+            <xml-root-element name="network-ranges"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkRange" name="network-range" type="inventory.aai.onap.org.v23.NetworkRange"/>
+            </java-attributes>
+        </java-type>
+        <!-- Comments to trigger build -->
+        <java-type name="NetworkRange">
+            <xml-root-element name="network-range"/>
+            <java-attributes>
+                <xml-element java-attribute="networkRangeId" name="network-range-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkRangeName" name="network-range-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkRangeType" name="network-range-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="type (ex, esi, vni, vni-rt, lacp-id)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkRangeRole" name="network-range-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role of network-range"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkRangeFunction" name="network-range-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="descriptive function"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="startRange" name="start-range" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="starting range for simple network ranges."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="endRange" name="end-range" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="end range for simple network ranges."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="lastAssigned" name="last-assigned" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="last assigned value for simple network ranges"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rangeFormat" name="range-format" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Format Decimal, Hexadecimal, etc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rangePrefix" name="range-prefix" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix of network range."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="activities" name="activities" type="inventory.aai.onap.org.v23.Activities"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Description of Network Range"/>
+                <xml-property name="nameProps" value="network-range-name,network-range-type"/>
+                <xml-property name="indexedProps" value="network-range-id,network-range-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="network-ranges"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/network-ranges/network-range/{network-range-id}"/>
+                <xml-property name="requiredProps" value="network-range-id,network-range-name,network-range-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Mappings">
+            <xml-properties>
+                <xml-property name="description" value="Collection of mappings."/>
+            </xml-properties>
+            <xml-root-element name="mappings"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="mapping" name="mapping" type="inventory.aai.onap.org.v23.Mapping"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Mapping">
+            <xml-root-element name="mapping"/>
+            <java-attributes>
+                <xml-element java-attribute="mappingId" name="mapping-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Key for mapping object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="mappingName" name="mapping-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of mapping"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="mappingType" name="mapping-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of mapping."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="mappingRole" name="mapping-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role of mapping"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="mappingFunction" name="mapping-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Function of mapping"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="mappingNumber" name="mapping-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Number of mapping"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="location1" name="location-1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Location 1"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="location2" name="location-2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Location 2"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="mappingGroupId" name="mapping-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Non-unique ID for grouping mappings"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Provision status for the mapping object. Valid values can be found at (https://wiki.web.att.com/display/SPTIIRP/prov-status)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="homedLocation" name="homed-location" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Location the object is homed to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="plannedLocation" name="planned-location" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Location the object is planned for"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General mechanism for mapping between instances; cg-nat."/>
+                <xml-property name="indexedProps" value="mapping-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="mapping-id"/>
+                <xml-property name="container" value="mappings"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/mappings/mapping/{mapping-id}"/>
+                <xml-property name="requiredProps" value="mapping-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="HwComponents">
+            <xml-root-element name="hw-components"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="hwComponent" name="hw-component" type="inventory.aai.onap.org.v23.HwComponent"/>
+            </java-attributes>
+            <xml-properties>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="HwComponent">
+            <xml-root-element name="hw-component"/>
+            <java-attributes>
+                <xml-element java-attribute="hwComponentId" name="hw-component-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hwComponentName" name="hw-component-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of hardware component"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hwComponentType" name="hw-component-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of hardware component"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hwComponentRole" name="hw-component-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role of hardware component"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hwComponentFunction" name="hw-component-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Function of hardware component"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="create/update/delete the hw-component node"/>
+                <xml-property name="indexedProps" value="hw-component-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="uriTemplate" value="/network/hw-components/hw-component/{hw-component-id}"/>
+                <xml-property name="requiredProps" value="hw-component-id"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="container" value="hw-components"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="SwComponents">
+            <xml-root-element name="sw-components"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="swComponent" name="sw-component" type="inventory.aai.onap.org.v23.SwComponent"/>
+            </java-attributes>
+            <xml-properties>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="SwComponent">
+            <xml-root-element name="sw-component"/>
+            <java-attributes>
+                <xml-element java-attribute="swComponentId" name="sw-component-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="swComponentName" name="sw-component-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of software component"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="swComponentType" name="sw-component-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of software component"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="swComponentRole" name="sw-component-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role of software component"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="swComponentFunction" name="sw-component-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Function of software component"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="create/update/delete the sw-component node"/>
+                <xml-property name="indexedProps" value="sw-component-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="uriTemplate" value="/network/sw-components/sw-component/{sw-component-id}"/>
+                <xml-property name="requiredProps" value="sw-component-id"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="container" value="sw-components"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="NetworkRoutes">
+            <xml-root-element name="network-routes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkRoute" name="network-route" type="inventory.aai.onap.org.v23.NetworkRoute"/>
+            </java-attributes>
+            <xml-properties>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="NetworkRoute">
+            <xml-root-element name="network-route"/>
+            <java-attributes>
+                <xml-element java-attribute="routeId" name="route-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique identifier example uuid."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="type" name="type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="used to categorize this object in conjunction with role &amp; function. The most generic category."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="role" name="role" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="used to categorize this object in conjunction with type &amp; function."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="function" name="function" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="used to categorize this object in conjunction with type &amp; role. The most specific category."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipAddress" name="ip-address" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip address that of the specific network-route."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="prefixLength" name="prefix-length" required="true" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="ip-address prefix length."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHop" name="next-hop" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Could be ip-address, hostname, or service-instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHopType" name="next-hop-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Should be ip-address, hostname, or service-instance to match next-hop."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="metric" name="metric" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Value that is assigned to an IP route for a particular network interface that identifies the cost that is associated with using that route."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="addressFamily" name="address-family" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="whether the route address is ipv4, ipv6."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="This object represents a network route. For instance, host-route, static-route."/>
+                <xml-property name="indexedProps" value="route-id,type,role,function,ip-address,prefix-length,next-hop,data-owner,data-source,data-source-version"/>
+                <xml-property name="uriTemplate" value="/network/network-routes/network-route/{route-id}"/>
+                <xml-property name="requiredProps" value="route-id,type,role,function,ip-address,prefix-length,address-family"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="container" value="network-routes"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="NextHops">
+            <xml-root-element name="next-hops"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="nextHop" name="next-hop" type="inventory.aai.onap.org.v23.NextHop"/>
+            </java-attributes>
+            <xml-properties>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="NextHop">
+            <xml-root-element name="next-hop"/>
+            <java-attributes>
+                <xml-element java-attribute="nextHopId" name="next-hop-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHopType" name="next-hop-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to categorize this object in conjunction with role &amp; function. The most generic category."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHopRole" name="next-hop-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to categorize this object in conjunction with type &amp; function."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHopFunction" name="next-hop-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to categorize this object in conjunction with type &amp; role. The most specific category."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sequence" name="sequence" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Sequence number."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="addressFamily" name="address-family" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Ipv4 or Ipv6."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipAddress" name="ip-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Next hop ip-address."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="metric" name="metric" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Cost that is associated with using the route."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Is among the series of routers that are connected together in a network and is the next possible destination for a data packet."/>
+                <xml-property name="indexedProps" value="next-hop-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="container" value="next-hops"/>
+                <xml-property name="uriTemplate" value="/network/next-hops/next-hop/{next-hop-id}"/>
+                <xml-property name="uniqueProps" value="next-hop-id"/>
+                <xml-property name="requiredProps" value="next-hop-id,next-hop-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Bfds">
+            <xml-root-element name="bfds"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="bfd" name="bfd" type="inventory.aai.onap.org.v23.Bfd"/>
+            </java-attributes>
+            <xml-properties>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Bfd">
+            <xml-root-element name="bfd"/>
+            <java-attributes>
+                <xml-element java-attribute="bfdId" name="bfd-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bfdType" name="bfd-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to categorize this object in conjunction with role &amp; function. The most generic category."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bfdRole" name="bfd-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to categorize this object in conjunction with type &amp; function."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bfdFunction" name="bfd-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to categorize this object in conjunction with type &amp; role. The most specific category."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bfdKeepAlive" name="bfd-keep-alive" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="bfd keep-alive parameter"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bfdTimeout" name="bfd-timeout" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="bfd timeout parameter"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="BFD (Bidirectional Forwarding Detection) is a protocol for detecting link failures.The BFD object is for persisting attributes for the links that have BFD enabled."/>
+                <xml-property name="indexedProps" value="bfd-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="container" value="bfds"/>
+                <xml-property name="uriTemplate" value="/network/bfds/bfd/{bfd-id}"/>
+                <xml-property name="uniqueProps" value="bfd-id"/>
+                <xml-property name="requiredProps" value="bfd-id,bfd-type"/>
+                <xml-property name="nameProps" value="bfd-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Fqdns">
+            <xml-root-element name="fqdns"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="fqdn" name="fqdn" type="inventory.aai.onap.org.v23.Fqdn"/>
+            </java-attributes>
+            <xml-properties>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Fqdn">
+            <xml-root-element name="fqdn"/>
+            <java-attributes>
+                <xml-element java-attribute="fqdn" name="fqdn" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Fully qualified domain name."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="fqdnType" name="fqdn-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to categorize this object in conjunction with role &amp; function. The most generic category."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="fqdnRole" name="fqdn-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to categorize this object in conjunction with type &amp; function."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="fqdnFunction" name="fqdn-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to categorize this object in conjunction with type &amp; role. The most specific category."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dnsDomain" name="dns-domain" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Domain name."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="A fully qualified domain name (FQDN) is the complete domain name for a specific computer, or host, on the internet."/>
+                <xml-property name="requiredProps" value="fqdn,dns-domain"/>
+                <xml-property name="indexedProps" value="fqdn,data-owner,data-source,data-source-version"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="container" value="fqdns"/>
+                <xml-property name="uriTemplate" value="/network/fqdns/fqdn/{fqdn}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="RouteTargets">
+            <xml-properties>
+                <xml-property name="description" value="Collection of route target information"/>
+            </xml-properties>
+            <xml-root-element name="route-targets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="routeTarget" name="route-target" type="inventory.aai.onap.org.v23.RouteTarget"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="RouteTarget">
+            <xml-root-element name="route-target"/>
+            <java-attributes>
+                <xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Number used to identify an RT, globally unique in the network"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routeTargetRole" name="route-target-role" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Role assigned to this route target"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object captures the Route target information | A&amp;AI clients for this object are typically: CDM/FCT, PINC; BICON, (DMaaP-DCAE,...) |"/>
+                <xml-property name="container" value="route-targets"/>
+                <xml-property name="dependentOn" value="vpn-binding,vrf"/>
+                <xml-property name="canBeLinked" value="true"/>
+                <xml-property name="uriTemplate" value="/route-targets/route-target/{global-route-target}/{route-target-role}"/>
+                <xml-property name="requiredProps" value="global-route-target,route-target-role"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="SriovPfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of SR-IOV Physical Functions."/>
+            </xml-properties>
+            <xml-root-element name="sriov-pfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sriovPf" name="sriov-pf" type="inventory.aai.onap.org.v23.SriovPf"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="SriovPf">
+            <xml-root-element name="sriov-pf"/>
+            <java-attributes>
+                <xml-element java-attribute="pfPciId" name="pf-pci-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifier for the sriov-pf"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="SR-IOV Physical Function"/>
+                <xml-property name="indexedProps" value="pf-pci-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="p-interface"/>
+                <xml-property name="container" value="sriov-pfs"/>
+                <xml-property name="uriTemplate" value="/sriov-pfs/sriov-pf/{pf-pci-id}"/>
+                <xml-property name="requiredProps" value="pf-pci-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="HostRoutes">
+            <xml-root-element name="host-routes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="hostRoute" name="host-route" type="inventory.aai.onap.org.v23.HostRoute"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="HostRoute">
+            <xml-root-element name="host-route"/>
+            <java-attributes>
+                <xml-element java-attribute="hostRouteId" name="host-route-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="host-route id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routePrefix" name="route-prefix" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="subnet prefix"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHop" name="next-hop" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Could be ip-address, hostname, or service-instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHopType" name="next-hop-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Should be ip-address, hostname, or service-instance to match next-hop"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="metric" name="metric" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Value that is assigned to an IP route for a particular network interface that identifies the cost that is associated with using that route."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object is configured to route packets to a specific host. Host routes are automatically added to the routing table for all IPv4 and IPv6 addresses that are configured on the router. The purpose of a host route is to create a corresponding CEF entry as a receive entry so that the packets destined to this IP address can be processed by the router itself. | A&amp;AI clients for this object are typically: SDNC, (DMaaP-DCAE,...) |"/>
+                <xml-property name="indexedProps" value="host-route-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="subnet"/>
+                <xml-property name="container" value="host-routes"/>
+                <xml-property name="uriTemplate" value="/host-routes/host-route/{host-route-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VipIpv4AddressList">
+            <xml-root-element name="vip-ipv4-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="vipIpv4Address" name="vip-ipv4-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vipIpv4PrefixLength" name="vip-ipv4-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 32 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv4 Address Range"/>
+                <xml-property name="indexedProps" value="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="uriTemplate" value="/vip-ipv4-address-list/{vip-ipv4-address}"/>
+                <xml-property name="requiredProps" value="vip-ipv4-address"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VipIpv6AddressList">
+            <xml-root-element name="vip-ipv6-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="vipIpv6Address" name="vip-ipv6-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vipIpv6PrefixLength" name="vip-ipv6-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 128 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv6 Address Range"/>
+                <xml-property name="indexedProps" value="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="uriTemplate" value="/vip-ipv6-address-list/{vip-ipv6-address}"/>
+                <xml-property name="requiredProps" value="vip-ipv6-address"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="OperationalEnvironments">
+            <xml-properties>
+                <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/>
+            </xml-properties>
+            <xml-root-element name="operational-environments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v23.OperationalEnvironment"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="OperationalEnvironment">
+            <xml-root-element name="operational-environment"/>
+            <java-attributes>
+                <xml-element java-attribute="operationalEnvironmentId" name="operational-environment-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of an operational environment"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalEnvironmentName" name="operational-environment-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operational Environment name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalEnvironmentType" name="operational-environment-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operational Environment Type."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalEnvironmentStatus" name="operational-environment-status" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Status"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tenantContext" name="tenant-context" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Tenant Context."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="workloadContext" name="workload-context" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Workload Context."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This is the logical partition of the cloud which allows to have multiple environments in the production AIC.   Node was introduced to support Tenant Isolation capability to establish operational environments that allows different virtual network functions to be loaded on the same cloud infrastructure but kept physically and logically separate.  Operation-environment is a logical partition of the cloud which allows to have multiple environments in the production AIC.  | A&amp;AI clients for this object are typically: VID, ASDC MSO, BICON, (DMaaP-DCAE,...) |"/>
+                <xml-property name="indexedProps" value="operational-environment-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="operational-environment-name"/>
+                <xml-property name="uniqueProps" value="operational-environment-id"/>
+                <xml-property name="container" value="operational-environments"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}"/>
+                <xml-property name="requiredProps" value="operational-environment-id,operational-environment-name,operational-environment-type,operational-environment-status,tenant-context,workload-context"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ForwardingPaths">
+            <xml-root-element name="forwarding-paths"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="forwardingPath" name="forwarding-path" type="inventory.aai.onap.org.v23.ForwardingPath"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ForwardingPath">
+            <xml-root-element name="forwarding-path"/>
+            <xml-properties>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="indexedProps" value="forwarding-path-id,forwarding-path-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="description" value="| SE group | This object captures the sequenced forwarding path between interfaces of services or resources | A&amp;AI clients for this object are typically: DCAE-CCS, IDF, (DMaaP-DCAE,...) |"/>
+                <xml-property name="container" value="forwarding-paths"/>
+                <xml-property name="nameProps" value="forwarding-path-name"/>
+                <xml-property name="uniqueProps" value="forwarding-path-id"/>
+                <xml-property name="uriTemplate" value="/network/forwarding-paths/forwarding-path/{forwarding-path-id}"/>
+                <xml-property name="requiredProps" value="forwarding-path-id,forwarding-path-name"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="forwardingPathId" name="forwarding-path-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of this FP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwardingPathName" name="forwarding-path-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the FP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the self link for this FP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwarders" name="forwarders" type="inventory.aai.onap.org.v23.Forwarders"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Forwarders">
+            <xml-root-element name="forwarders"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="forwarder" name="forwarder" type="inventory.aai.onap.org.v23.Forwarder"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Forwarder">
+            <xml-root-element name="forwarder"/>
+            <xml-properties>
+                <xml-property name="indexedProps" value="sequence,data-owner,data-source,data-source-version"/>
+                <xml-property name="description" value="| SE group | This object captures the sequenced segment of forwarding path | A&amp;AI clients for this object are typically: DCAE-CCS, (DMaaP-DCAE,...) |"/>
+                <xml-property name="container" value="forwarders"/>
+                <xml-property name="dependentOn" value="forwarding-path"/>
+                <xml-property name="uriTemplate" value="/forwarders/forwarder/{sequence}"/>
+                <xml-property name="requiredProps" value="sequence"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="sequence" name="sequence" required="true" type="java.lang.Integer" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of this segmentation"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwarderRole" name="forwarder-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ingress, intermediate, egress"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ForwarderEvcs">
+            <xml-root-element name="forwarder-evcs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="forwarderEvc" name="forwarder-evc" type="inventory.aai.onap.org.v23.ForwarderEvc"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ForwarderEvc">
+            <xml-root-element name="forwarder-evc"/>
+            <java-attributes>
+                <xml-element java-attribute="forwarderEvcId" name="forwarder-evc-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Key for forwarder-evc object"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit ID from customer/ESP/ingress end of EVC, or reference to beater circuit on gateway/network/egress end of EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ivlan" name="ivlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Internal VLAN."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="svlan" name="svlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="SVLAN value for ingress of egress forwarder."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CVLAN value for ingress of egress forwarder."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanMappings" name="vlan-mappings" type="inventory.aai.onap.org.v23.VlanMappings"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object is an optional child object of the configuration object. | A&amp;AI clients for this object are typically: APPC, SDNC, (DMaaP-DCAE,...) |"/>
+                <xml-property name="dependentOn" value="configuration"/>
+                <xml-property name="uniqueProps" value="forwarder-evc-id"/>
+                <xml-property name="container" value="forwarder-evcs"/>
+                <xml-property name="uriTemplate" value="/forwarder-evcs/forwarder-evc/{forwarder-evc-id}"/>
+                <xml-property name="requiredProps" value="forwarder-evc-id"/>
+                <xml-property name="indexedProps" value="circuit-id,data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VlanMappings">
+            <xml-properties>
+                <xml-property name="description" value="Collection of vlan mappings."/>
+            </xml-properties>
+            <xml-root-element name="vlan-mappings"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlanMapping" name="vlan-mapping" type="inventory.aai.onap.org.v23.VlanMapping"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VlanMapping">
+            <xml-root-element name="vlan-mapping"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanMappingId" name="vlan-mapping-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Key for vlan-mapping object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="uniCvlan" name="uni-cvlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CVLAN value from the UNI/ingress side of the SAREA gateway access device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nniSvlan" name="nni-svlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="SVLAN value from the NNI/egress side of the SAREA gateway access device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nniCvlan" name="nni-cvlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CVLAN value from the NNI/egress side of the SAREA gateway access device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ivLan" name="ivlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The internal VLAN ('IVLAN') value.  Specific to Arista devices."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="vlan-mapping object is an optional child object of the forwarder-evc object.  A given forwarder-evc object may have multiple vlan-mapping objects."/>
+                <xml-property name="dependentOn" value="forwarder-evc"/>
+                <xml-property name="uniqueProps" value="vlan-mapping-id"/>
+                <xml-property name="container" value="vlan-mappings"/>
+                <xml-property name="uriTemplate" value="/vlan-mappings/vlan-mapping/{vlan-mapping-id}"/>
+                <xml-property name="requiredProps" value="vlan-mapping-id"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Evcs">
+            <xml-root-element name="evcs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="evc" name="evc" type="inventory.aai.onap.org.v23.Evc"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Evc">
+            <xml-root-element name="evc"/>
+            <java-attributes>
+                <xml-element java-attribute="evcId" name="evc-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique/key field for the evc object"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwardingPathTopology" name="forwarding-path-topology" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Point-to-Point, Multi-Point"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cirValue" name="cir-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Commited Information Rate"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cirUnits" name="cir-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CIR units"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cmtu" name="cmtu" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Size of the Customer Requested MTU (Maximum Transmission Unit)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="connectionDiversityGroupId" name="connection-diversity-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Diversity Group ID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceHours" name="service-hours" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="formerly Performance Group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="enhancedMulticast" name="enhanced-multicast" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String value indicating whether the EVC uses enhanced multicast. Possible Values: yes/no/[empty string]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espEvcCircuitId" name="esp-evc-circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="EVC Circuit ID of ESP EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espEvcCirValue" name="esp-evc-cir-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Committed Information Rate (For ESP)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espEvcCirUnits" name="esp-evc-cir-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CIR units (For ESP)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espItuCode" name="esp-itu-code" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies ESP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectorPopClli" name="collector-pop-clli" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collector POP CLLI (from the hostname of the access pnf)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interConnectTypeIngress" name="inter-connect-type-ingress" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Interconnect type on ingress side of EVC."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tagmodeAccessIngress" name="tagmode-access-ingress" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="tagode for collector side of EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tagmodeAccessEgress" name="tagmode-access-egress" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="tagMode for network side of EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="productEntryId" name="product-entry-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Product ID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object is an optional child object of the configuration object. | A&amp;AI clients for this object are typically: IDF, SDNC, SDN-GC, (DMaaP-DCAE,...) |"/>
+                <xml-property name="dependentOn" value="configuration"/>
+                <xml-property name="uniqueProps" value="evc-id"/>
+                <xml-property name="container" value="evcs"/>
+                <xml-property name="uriTemplate" value="/evcs/evc/{evc-id}"/>
+                <xml-property name="requiredProps" value="evc-id"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Collections">
+            <xml-root-element name="collections"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="collection" name="collection" type="inventory.aai.onap.org.v23.Collection"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Collection">
+            <xml-root-element name="collection"/>
+            <java-attributes>
+                <xml-element java-attribute="collectionId" name="collection-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection Object UUID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ASDC model id for this resource or service model"/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Model Version"/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionName" name="collection-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="collection name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionType" name="collection-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection type"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionRole" name="collection-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection Role"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionFunction" name="collection-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection function"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="orchestration status"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionCustomizationId" name="collection-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the id of all the configuration used to customize the resource for the service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="description" value="| SE group | This object represents the collection resource in the TOSCA model | A&amp;AI clients for this object are typically: (DMaaP-DCAE,...) |"/>
+                <xml-property name="uniqueProps" value="collection-id"/>
+                <xml-property name="indexedProps" value="collection-id,model-invariant-id,model-version-id,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="collections"/>
+                <xml-property name="uriTemplate" value="/network/collections/collection/{collection-id}"/>
+                <xml-property name="requiredProps" value="collection-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Cps">
+            <xml-properties>
+                <xml-property name="description" value="Collection of connection points."/>
+            </xml-properties>
+            <xml-root-element name="cps"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cp" name="cp" type="inventory.aai.onap.org.v23.Cp"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Cp">
+            <xml-root-element name="cp"/>
+            <java-attributes>
+                <xml-element java-attribute="cpInstanceId" name="cp-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of the connection point."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portId" name="port-id" required="false" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="port index to represent multiple CPs on VNFC connected to same network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v23.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v23.L3InterfaceIpv6AddressList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object captures the point of attachment from services or resources to a virtual link or network. | A&amp;AI clients for this object are typically: DCAE-DTI, (DMaaP-DCAE,...) |"/>
+                <xml-property name="uniqueProps" value="cp-instance-id"/>
+                <xml-property name="dependentOn" value="vnfc"/>
+                <xml-property name="container" value="cps"/>
+                <xml-property name="uriTemplate" value="/cps/cp/{cp-instance-id}"/>
+                <xml-property name="requiredProps" value="cp-instance-id"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VlanTags">
+            <xml-properties>
+                <xml-property name="description" value="Vlan Tags Assigned out of a Vlan Range"/>
+            </xml-properties>
+            <xml-root-element name="vlan-tags"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlanTag" name="vlan-tag" type="inventory.aai.onap.org.v23.VlanTag"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="VlanTag">
+            <xml-root-element name="vlan-tag"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanTagId" name="vlan-tag-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Vlan Tag Id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanTagRole" name="vlan-tag-role" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role assigned to this vlan-tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="is private flag."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="VLAN tag Type"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="VLAN Tag Function"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configPhase" name="config-phase" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The config-phase associated with this vlan-tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="vlan tag information"/>
+                <xml-property name="container" value="vlan-tags"/>
+                <xml-property name="dependentOn" value="vlan-range"/>
+                <xml-property name="uriTemplate" value="/vlan-tags/vlan-tag/{vlan-tag-id}"/>
+                <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version,vlan-id-outer"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="GeoRegions">
+            <xml-properties>
+                <xml-property name="description" value="Collection of geo-regions"/>
+            </xml-properties>
+            <xml-root-element name="geo-regions"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="geoRegion" name="geo-region" type="inventory.aai.onap.org.v23.GeoRegion"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="GeoRegion">
+            <xml-root-element name="geo-region"/>
+            <java-attributes>
+                <xml-element java-attribute="geoRegionId" name="geo-region-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID, key for geo-region object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="geoRegionName" name="geo-region-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of geo-region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="geoRegionType" name="geo-region-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of geo-region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="geoRegionRole" name="geo-region-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role of geo-region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="geoRegionFunction" name="geo-region-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Function of geo-region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Top level node for a cg-nat geographical region."/>
+                <xml-property name="indexedProps" value="geo-region-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="geo-region-id"/>
+                <xml-property name="container" value="geo-regions"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/geo-regions/geo-region/{geo-region-id}"/>
+                <xml-property name="requiredProps" value="geo-region-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="NetworkTechnologies">
+            <xml-properties>
+                <xml-property name="description" value=" The network-technology object is used to capture the supported network technologies of a cloud-region."/>
+            </xml-properties>
+            <xml-root-element name="network-technologies"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkTechnology" name="network-technology" type="inventory.aai.onap.org.v23.NetworkTechnology"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="NetworkTechnology">
+            <xml-root-element name="network-technology"/>
+            <java-attributes>
+                <xml-element java-attribute="networkTechnologyId" name="network-technology-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier of the network-technology object (UUID)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkTechnologyName" name="network-technology-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The network-technology  that a cloud-region can support. Current valid values- CONTRAIL AIC_SR_IOV OVS STANDARD-SR-IOV"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object captures the supported network technologies of a cloud-region. | A&amp;AI clients for this object are typically: RO, AAI-TOOLS, (DMaaP-DCAE,...) |"/>
+                <xml-property name="nameProps" value="network-technology-id,network-technology-name"/>
+                <xml-property name="uniqueProps" value="network-technology-id"/>
+                <xml-property name="container" value="network-technologies"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/network-technologies/network-technology/{network-technology-id}"/>
+                <xml-property name="requiredProps" value="network-technology-id,network-technology-name"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Common">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for common inventory resources."/>
+            </xml-properties>
+            <xml-root-element name="common"/>
+            <java-attributes>
+                <xml-element java-attribute="hardwareCatalogItems" name="hardware-catalog-items" type="inventory.aai.onap.org.v23.HardwareCatalogItems"/>
+                <xml-element java-attribute="profiles" name="profiles" type="inventory.aai.onap.org.v23.Profiles"/>
+                <xml-element java-attribute="contacts" name="contacts" type="inventory.aai.onap.org.v23.Contacts"/>
+                <xml-element java-attribute="objectGroups" name="object-groups" type="inventory.aai.onap.org.v23.ObjectGroups"/>
+                <xml-element java-attribute="policies" name="policies" type="inventory.aai.onap.org.v23.Policies"/>
+                <xml-element java-attribute="vlanCharacteristics" name="vlan-characteristics" type="inventory.aai.onap.org.v23.VlanCharacteristics"/>
+                <xml-element java-attribute="relationshipRules" name="relationship-rules" type="inventory.aai.onap.org.v23.RelationshipRules"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="HardwareCatalogItems">
+            <xml-properties>
+                <xml-property name="description" value="Collection of hardware-catalog-items"/>
+            </xml-properties>
+            <xml-root-element name="hardware-catalog-items"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="hardwareCatalogItem" name="hardware-catalog-item" type="inventory.aai.onap.org.v23.HardwareCatalogItem"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="HardwareCatalogItem">
+            <xml-root-element name="hardware-catalog-item"/>
+            <java-attributes>
+                <xml-element java-attribute="itemName" name="item-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique name for the hardware-catalog-item"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="systemType" name="system-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of system defined by ATT"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="manufacturer" name="manufacturer" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Manufacturer of the hardware-catalog-item (ex,Cisco)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="model" name="model" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Model of the hardware-catalog-item (ex,5501 NCS)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="partNumber" name="part-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Part number assigned by the manufacturer"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description of the hardware-catalog-item"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sku" name="sku" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Stock-keeping-unit (ATT specific identifier for the hardware-catalog-item)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes an hardware-catalog-items"/>
+                <xml-property name="indexedProps" value="item-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="item-name"/>
+                <xml-property name="container" value="hardware-catalog-items"/>
+                <xml-property name="namespace" value="common"/>
+                <xml-property name="uriTemplate" value="/common/hardware-catalog-items/hardware-catalog-item/{item-name}"/>
+                <xml-property name="requiredProps" value="item-name,system-type,manufacturer,model,sku"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Profiles">
+            <xml-properties>
+                <xml-property name="description" value="Collection of profiles"/>
+            </xml-properties>
+            <xml-root-element name="profiles"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="profile" name="profile" type="inventory.aai.onap.org.v23.Profile"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Profile">
+            <xml-root-element name="profile"/>
+            <java-attributes>
+                <xml-element java-attribute="profileName" name="profile-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique name for the profile."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="profileType" name="profile-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of profile (ex,network-power-profile)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="characteristics" name="characteristics" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Set of characteristics of the profile."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="profileSubtype" name="profile-subtype" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Descriptive subtype."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="profileRole" name="profile-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="used to categorize this object in conjunction with profile-type and profile-function."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="profileFunction" name="profile-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="used to categorize this object in conjunction with profile-type and profile-role. The most specific category"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v23.Metadata"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes an profiles"/>
+                <xml-property name="indexedProps" value="profile-name,profile-role,profile-function,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="profile-name"/>
+                <xml-property name="nameProps" value="profile-type"/>
+                <xml-property name="container" value="profiles"/>
+                <xml-property name="namespace" value="common"/>
+                <xml-property name="uriTemplate" value="/common/profiles/profile/{profile-name}"/>
+                <xml-property name="requiredProps" value="profile-name,profile-type,characteristics"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Contacts">
+            <xml-properties>
+                <xml-property name="description" value="Collection of contacts"/>
+            </xml-properties>
+            <xml-root-element name="contacts"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="contact" name="contact" type="inventory.aai.onap.org.v23.Contact"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="Contact">
+            <xml-root-element name="contact"/>
+            <java-attributes>
+                <xml-element java-attribute="contactName" name="contact-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the contact"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="contactTelephone" name="contact-telephone" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Tel no. of contact"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="contactEmail" name="contact-email" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="e-mail of contact"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vendorType" name="vendor-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="NI (Network Integrator)SI (System Integrator) 3rd Party LCM"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | This object captures the vendor information and have a relationship to the generic-vnf. This will be populated by SDN-GC | A&amp;AI clients for this object are typically: (DMaaP-DCAE,...) |"/>
+                <xml-property name="uniqueProps" value="contact-name"/>
+                <xml-property name="container" value="contacts"/>
+                <xml-property name="namespace" value="common"/>
+                <xml-property name="nameProps" value="contact-name,vendor-type"/>
+                <xml-property name="uriTemplate" value="/common/contacts/contact/{contact-name}"/>
+                <xml-property name="requiredProps" value="contact-name"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ObjectGroups">
+            <xml-properties>
+                <xml-property name="description" value="Collection of object-groups"/>
+            </xml-properties>
+            <xml-root-element name="object-groups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="objectGroup" name="object-group" type="inventory.aai.onap.org.v23.ObjectGroup"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ObjectGroup">
+            <xml-root-element name="object-group"/>
+            <java-attributes>
+                <xml-element java-attribute="objectGroupId" name="object-group-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="groupType" name="group-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of object contained in the list."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="groupName" name="group-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the list."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="groupName2" name="group-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alias name for object-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="version" name="version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="used to track the versions of the object"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="communityList" name="community-list" type="inventory.aai.onap.org.v23.CommunityList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v23.IpAddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="portList" name="port-list" type="inventory.aai.onap.org.v23.PortList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="selectorList" name="selector-list" type="inventory.aai.onap.org.v23.SelectorList"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes an object-group"/>
+                <xml-property name="indexedProps" value="object-group-id,version,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="object-groups"/>
+                <xml-property name="namespace" value="common"/>
+                <xml-property name="uriTemplate" value="/common/object-groups/object-group/{object-group-id}"/>
+                <xml-property name="requiredProps" value="object-group-id,group-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="CommunityList">
+            <xml-root-element name="community-list"/>
+            <java-attributes>
+                <xml-element java-attribute="communityValue" name="community-value" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="String value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="type" name="type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String type"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Community List"/>
+                <xml-property name="dependentOn" value="object-group"/>
+                <xml-property name="uriTemplate" value="/community-list/{community-value}"/>
+                <xml-property name="requiredProps" value="community-value"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="IpAddressList">
+            <xml-root-element name="ip-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="ipAddress" name="ip-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipAddressEnd" name="ip-address-end" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address end range"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip version, either 4 or 6"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="type" name="type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="reserved, static, dhcp"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="assignment" name="assignment" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value=""/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operator" name="operator" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operator to apply to the port (greater than, less than, etc)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="length" name="length" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="ip-address prefix length, 32 for single address."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IP Address Range"/>
+                <xml-property name="dependentOn" value="endpoint,subnet,rule,policy,object-group"/>
+                <xml-property name="uriTemplate" value="/ip-address-list/{ip-address}"/>
+                <xml-property name="requiredProps" value="ip-address"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="PortList">
+            <xml-root-element name="port-list"/>
+            <java-attributes>
+                <xml-element java-attribute="port" name="port" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Port number"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="assignment" name="assignment" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name or assignment for the port"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="type" name="type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type or usage of the port"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operator" name="operator" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operator to apply to the port (greater than, less than, etc)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Port List Range"/>
+                <xml-property name="dependentOn" value="endpoint,rule,object-group"/>
+                <xml-property name="uriTemplate" value="/port-list/{port}"/>
+                <xml-property name="requiredProps" value="port"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="SelectorList">
+            <xml-root-element name="selector-list"/>
+            <java-attributes>
+                <xml-element java-attribute="selector" name="selector" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Selector"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="assignment" name="assignment" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name or assignment for the selector"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="type" name="type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type or usage of the selector"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Selectors list"/>
+                <xml-property name="dependentOn" value="rule,object-group,endpoint,policy"/>
+                <xml-property name="uriTemplate" value="/selector-list/{selector}"/>
+                <xml-property name="requiredProps" value="selector"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Policies">
+            <xml-root-element name="policies"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="policy" name="policy" type="inventory.aai.onap.org.v23.Policy"/>
+            </java-attributes>
+            <xml-properties>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Policy">
+            <xml-root-element name="policy"/>
+            <java-attributes>
+                <xml-element java-attribute="policyId" name="policy-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique Policy UUID."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="policyName" name="policy-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Policy Name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="policyType" name="policy-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Policy Type"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="policyRole" name="policy-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Policy role"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="policyFunction" name="policy-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="policy function"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="doNotTrack" name="do-not-track" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Do not track"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="preDnat" name="pre-dnat" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Pre destination NAT"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="applyOnForward" name="apply-on-forward" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="apply on forward"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selector" name="selector" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Host and Interface Type Selector"/>
+                        <xml-property name="dbAlias" value="selector-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="order" name="order" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Order"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="version" name="version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="status" name="status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Status"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="remoteAsn" name="remote-asn" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Remote ASN"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="namespace" name="namespace" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Namespace filter to apply the policy"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="policyDescription" name="policy-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description of the policy"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="policyVariables" name="policy-variables" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Set of rule variables"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="policyVariableName" name="policy-variable-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Policy Variable Name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rules" name="rules" type="inventory.aai.onap.org.v23.Rules"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v23.IpAddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="selectorList" name="selector-list" type="inventory.aai.onap.org.v23.SelectorList"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of policy"/>
+                <xml-property name="indexedProps" value="policy-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="policy-id"/>
+                <xml-property name="container" value="policies"/>
+                <xml-property name="namespace" value="common"/>
+                <xml-property name="uriTemplate" value="/common/policies/policy/{policy-id}"/>
+                <xml-property name="requiredProps" value="policy-id,do-not-track,pre-dnat,apply-on-forward"/>
+            </xml-properties>
+        </java-type>
+
+
+        <java-type name="Rules">
+            <xml-properties>
+                <xml-property name="description" value="Collection of rules"/>
+            </xml-properties>
+            <xml-root-element name="rules"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="rule" name="rule" type="inventory.aai.onap.org.v23.Rule"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Rule">
+            <xml-root-element name="rule"/>
+            <java-attributes>
+                <xml-element java-attribute="ruleId" name="rule-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="direction" name="direction" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ingress or egress"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="protocol" name="protocol" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Positive protocol match. tcp, udp, icmpv6, sctp, udplite, integer 1-255."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="notProtocol" name="not-protocol" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Negative protocol match. tcp, udp, icmpv6, sctp, udplite, integer 1-255."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="action" name="action" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Action to perform when matching this rule."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="icmp" name="icmp" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value=""/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="notIcmp" name="not-icmp" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value=""/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sequence" name="sequence" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Sequence number of the rule."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="threshold" name="threshold" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Threshold"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="status" name="status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="status"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="version" name="version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="countVariable" name="count-variable" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Named variable used for counting transactions."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="log" name="log" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Boolean to indicate whether or not logging is required."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v23.IpAddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="portList" name="port-list" type="inventory.aai.onap.org.v23.PortList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="selectorList" name="selector-list" type="inventory.aai.onap.org.v23.SelectorList"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes an rules"/>
+                <xml-property name="container" value="rules"/>
+                <xml-property name="dependentOn" value="policy"/>
+                <xml-property name="uriTemplate" value="/rules/rule/{rule-id}"/>
+                <xml-property name="requiredProps" value="rule-id,log"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VlanCharacteristics">
+            <xml-properties>
+                <xml-property name="description" value="Collection of vlan characteristics"/>
+            </xml-properties>
+            <xml-root-element name="vlan-characteristics"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlanCharacteristic" name="vlan-characteristic" type="inventory.aai.onap.org.v23.VlanCharacteristic"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VlanCharacteristic">
+            <xml-root-element name="vlan-characteristic"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanCharacteristicId" name="vlan-characteristic-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rootName" name="root-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="appliesTo" name="applies-to" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Device role the vlan-characteristic applies to (c-agg-leaf-a, c-agg-leaf-b, r-leaf)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="dhcpPool" name="dhcp-pool" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="DHCP Agent access."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="internetAccess" name="internet-access" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Boolean to represent if requires internet access."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes an vlan characteristic"/>
+                <xml-property name="indexedProps" value="vlan-characteristic-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="vlan-characteristics"/>
+                <xml-property name="namespace" value="common"/>
+                <xml-property name="uriTemplate" value="/common/vlan-characteristics/vlan-characteristic/{vlan-characteristic-id}"/>
+                <xml-property name="requiredProps" value="vlan-characteristic-id,dhcp-pool,internet-access"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="RelationshipRules">
+            <xml-properties>
+                <xml-property name="description" value="Collection of relationship rules"/>
+            </xml-properties>
+            <xml-root-element name="relationship-rules"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationshipRule" name="relationship-rule" type="inventory.aai.onap.org.v23.RelationshipRule"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RelationshipRule">
+            <xml-root-element name="relationship-rule"/>
+            <java-attributes>
+                <xml-element java-attribute="ruleId" name="rule-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="context" name="context" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Example global,site"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ruleTraversals" name="rule-traversals" required="true" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Number of traversals"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="appliesTo" name="applies-to" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Node the related object applies to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipComponents" name="relationship-components" type="inventory.aai.onap.org.v23.RelationshipComponents"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes an relationship rule"/>
+                <xml-property name="indexedProps" value="rule-id,context,rule-traversals,applies-to,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="rule-id"/>
+                <xml-property name="container" value="relationship-rules"/>
+                <xml-property name="namespace" value="common"/>
+                <xml-property name="uriTemplate" value="/common/relationship-rules/relationship-rule/{rule-id}"/>
+                <xml-property name="requiredProps" value="rule-id,context,rule-traversals,applies-to"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="RelationshipComponents">
+            <xml-properties>
+                <xml-property name="description" value="Collection of relationship components"/>
+            </xml-properties>
+            <xml-root-element name="relationship-components"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationshipComponent" name="relationship-component" type="inventory.aai.onap.org.v23.RelationshipComponent"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RelationshipComponent">
+            <xml-root-element name="relationship-component"/>
+            <java-attributes>
+                <xml-element java-attribute="ruleNode" name="rule-node" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="NARAD object"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ruleProperty" name="rule-property" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Object property"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ruleValue" name="rule-value" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Property value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="componentOrder" name="component-order" required="true" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Order in traversal"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes an relationship component"/>
+                <xml-property name="indexedProps" value="rule-node,rule-property,rule-value,component-order,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="relationship-components"/>
+                <xml-property name="dependentOn" value="relationship-rule"/>
+                <xml-property name="uriTemplate" value="common/relationship-components/relationship-component/{rule-node}"/>
+                <xml-property name="requiredProps" value="rule-node,rule-property,rule-value,component-order"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="AggregateRoutes">
+            <xml-properties>
+                <xml-property name="description" value="Collection of aggregate routes."/>
+            </xml-properties>
+            <xml-root-element name="aggregate-routes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="aggregateRoute" name="aggregate-route" type="inventory.aai.onap.org.v23.AggregateRoute"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="AggregateRoute">
+            <xml-root-element name="aggregate-route"/>
+            <java-attributes>
+                <xml-element java-attribute="aggRouteId" name="agg-route-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Route UUID."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the forwarding-path"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CIDR-mask for aggregate route subnet"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies is aggregate route is ipv4 or ipv6"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkAddress" name="network-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network Address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHop" name="next-hop" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Next Hop"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routePath" name="route-path" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Route Path"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v23.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="| SE group | Configs of this object are used on D2 IPEs for the Voice services. SDNC will create these objects and write them to AAI. | A&amp;AI clients for this object are typically: CDM, NLS, (DMaaP-DCAE,...) |"/>
+                <xml-property name="indexedProps" value="agg-route-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="aggregate-routes"/>
+                <xml-property name="dependentOn" value="vrf,l3-network"/>
+                <xml-property name="uriTemplate" value="/aggregate-routes/aggregate-route/{agg-route-id}"/>
+                <xml-property name="requiredProps" value="agg-route-id"/>
+            </xml-properties>
+        </java-type>
+
+    </java-types>
+</xml-bindings>
\ No newline at end of file
diff --git a/src/app/assets/configuration/aai/reference/types.json b/src/app/assets/configuration/aai/reference/types.json
new file mode 100644
index 0000000..fe51488
--- /dev/null
+++ b/src/app/assets/configuration/aai/reference/types.json
@@ -0,0 +1 @@
+[]
diff --git a/src/app/assets/configuration/app_config.json b/src/app/assets/configuration/app_config.json
new file mode 100644
index 0000000..a66c872
--- /dev/null
+++ b/src/app/assets/configuration/app_config.json
@@ -0,0 +1,11 @@
+{
+    
+    "AAI":{
+        "TITLE": "A&AI",
+        "OXM": "oxm.xml",
+        "INVLIST": "InvList.json",
+        "CUSTQUERYLIST": "CustomQueryList.json"
+    },
+    "APP_TITLE_REGX": "\/services\/(\\w+)",
+    "APP_TITLE_REGX_LOCAL": "\/(\\w+)/#"
+}
diff --git a/src/app/assets/configuration/dsl_detailedHelp.json b/src/app/assets/configuration/dsl_detailedHelp.json
new file mode 100644
index 0000000..29d7b8e
--- /dev/null
+++ b/src/app/assets/configuration/dsl_detailedHelp.json
@@ -0,0 +1,153 @@
+{
+  "simple": {
+    "abstract" : "Easy queries to display a node with properties",
+    "notation": [
+      {
+        "notation": "complex*('key','value')",
+        "description": "Display Complex with key=value"
+      },
+      {
+        "notation": "complex*('key1','val1')('key2','val2')",
+        "description": "Display Complex with key1=val1 AND key2=val2"
+      },
+      {
+        "notation": "complex*('key1','val1')!('key2','val2')",
+        "description": "Negation - Display Complex with key1=val1 AND key2!=val2"
+      },
+      {
+        "notation": "complex*!('key1','val1')!('key2','val2')",
+        "description": "Negation - Display Complex with key1!=val1 AND key2!=val2"
+      }
+    ]
+  },
+  "traversal":{
+    "abstract" : "Build a Query to traverse from one node to the next",
+    "notation": [
+      {
+        "notation": "complex*('country','val') > cloud-region*",
+        "description": "Traverse from Complex to Cloud-region and Display Complexes and Cloud-Regions"
+      },
+      {
+        "notation": "complex*('country','val') > cloud-region*('key1','val1')('key2''val2')",
+        "description": "Traverse from Complex to Cloud-region with filters and display Complexes and Cloud-Regions"
+      },
+      {
+        "notation": "generic-vnf*('nf-type','abc') > vserver > tenant > cloud-region*('key','val') ",
+        "description": "Chain of traversals "
+      }
+    ]
+  },
+  "union": {
+    "abstract" : "Build a Query to have a union of nodes",
+    "notation": [
+      {
+        "notation": " complex* (‘key’,’value’) > [cloud-region*, availability-zone*]",
+        "description": "Display union of nodes"
+      },
+      {
+        "notation": "generic-vnf('key','val')> [pserver*, vserver > pserver*]",
+        "description": "Traversal within a Union - Display pserver and vserver for a node"
+      }
+    ]
+  },
+  "limit": {
+    "abstract": "Build a Query to limit the display of nodes",
+    "notation": [
+      {
+        "notation": " complex*('country','USA') LIMIT 1",
+        "description": "Display the complex in USA limiting the result to 1 "
+      },
+      {
+        "notation": "generic-vnf('key','val')> [pserver*, vserver > pserver*] LIMIT 5",
+        "description": "Display the first 5 pservers in a generic-vnf"
+      }
+    ]
+  },
+  "topology": {
+    "abstract" : "Commonly used topology Queries",
+    "notation": [
+      {
+        "notation": " generic-vnf('key','val')> [vnfc*, vserver*, pnf*, pserver*, vserver > pserver*]",
+        "description": "Display the fn-topology "
+      },
+      {
+        "notation": "pnf > [complex* , p-interface* > physical-links* > p-interface >[ pserver* , pnf*]",
+        "description": "Display the pnf topology"
+      }
+    ]
+  },
+  "negation": {
+    "abstract": "Build a NOT Query ",
+    "notation": [
+      {
+        "notation": " complex*!('country','USA') LIMIT 1",
+        "description": "Display the complex NOT in USA   "
+      },
+      {
+        "notation": "complex > [cloud-region*, availability-zone*!('hypervisor-type','VMWare')]",
+        "description": "Display availability-zone which does NOT have hypervisor=VMWare"
+      }
+    ]
+  },
+  "advanced": {
+    "abstract": "Build an Advanced Query ",
+    "notation": [
+      {
+        "notation": "complex*('key',EQ('value'))",
+        "description": "EQ = equals"
+      },
+      {
+        "notation": "complex*('key',NEQ('value'))",
+        "description": "NEQ = not equals"
+      },
+      {
+        "notation": "complex*('key',GT('value'))",
+        "description": "GT = greater than"
+      },
+      {
+        "notation": "complex*('key',LT('value'))",
+        "description": "LT = less than"
+      },
+      {
+        "notation": "complex*('key',GTE('value'))",
+        "description": "GTE = greater than or equal"
+      },
+      {
+        "notation": "complex*('key',LTE('value'))",
+        "description": "LTE = less than or equal"
+      },
+      {
+        "notation": "complex*('key',REGEX('^.*value'))",
+        "description": "REGEX = Matching a given POSIX regular expressions pattern"
+      },
+      {
+        "notation": "complex*('key',NOT_REGEX('^.*value'))",
+        "description": "NOT_REGEX = Not matching a given POSIX regular expression pattern"
+      },
+      {
+        "notation": "complex*('key', CONTAINS('value'))",
+        "description": "CONTAINS = containing the string"
+      },
+      {
+        "notation": "complex*('key',NOT_CONTAINS('value'))",
+        "description": "NOT_CONTAINS = not containing the string"
+      },
+      {
+        "notation": "complex*('key',STARTS_WITH('value'))",
+        "description": "STARTS_WITH = Starting with the string"
+      },
+      {
+        "notation": "complex*('key',NOT_STARTS_WITH('value'))",
+        "description": "NOT_STARTS_WITH = Not starting with the string"
+      },
+      {
+        "notation": "complex*('key',ENDS_WITH('value'))",
+        "description": "ENDS_WITH = Ending with the string"
+      },
+      {
+        "notation": "complex*('key',NOT_ENDS_WITH('value'))",
+        "description": "NOT_ENDS_WITH = Not ending with the string"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/app/assets/configuration/dsl_hints.json b/src/app/assets/configuration/dsl_hints.json
new file mode 100644
index 0000000..b90d9c4
--- /dev/null
+++ b/src/app/assets/configuration/dsl_hints.json
@@ -0,0 +1,36 @@
+{
+
+  "notation01": {
+    "notation": "complex*",
+    "description": "Display Complex"
+  },
+  "notation02": {
+    "notation": "complex*(<Indexed Parameter>,<value>)",
+    "description": "Display Complex by Indexed Parameter"
+  },
+  "notation03": {
+    "notation": "complex(<Indexed Parameter>,<value>) > cloud-region*",
+    "description": "Traverse from Complex to Cloud-region"
+  },
+  "notation05": {
+    "notation": "Asterix *",
+    "description": "Select *"
+  },
+  "notation06": {
+    "notation": " complex > [cloud-region*, availability-zone*]",
+    "description": "Display union of nodes"
+  },
+  "notation07": {
+    "notation": "Negation !",
+    "description": "Negation"
+  },
+  "notation08": {
+    "notation": "LIMIT",
+    "description": "Limit the results"
+  },
+  "notation09": {
+    "notation": "Alt+H",
+    "description": "Inline Help Page"
+  }
+
+}
\ No newline at end of file
diff --git a/src/app/assets/configuration/test.json b/src/app/assets/configuration/test.json
new file mode 100644
index 0000000..ce5313b
--- /dev/null
+++ b/src/app/assets/configuration/test.json
@@ -0,0 +1,348 @@
+[
+  {
+    "properties": {
+      "as-number": "",
+      "encrypted-access-flag": "",
+      "entitlement-assignment-group-uuid": "",
+      "entitlement-resource-uuid": "",
+      "equipment-role": "",
+      "heat-stack-id": "",
+      "in-maint": true,
+      "ipv4-loopback0-address": "ipv4-loopback0-address-ALL-GOOD-one",
+      "ipv4-oam-address": "",
+      "ipv4-oam-gateway-address": "",
+      "ipv4-oam-gateway-address-prefix-length": "",
+      "is-closed-loop-disabled": "",
+      "license-assignment-group-uuid": "",
+      "license-key": "",
+      "license-key-uuid": "",
+      "management-option": "",
+      "management-v6-address": "",
+      "model-customization-id": "",
+      "model-invariant-id": "",
+      "model-version-id": "",
+      "mso-catalog-key": "",
+      "nf-function": "",
+      "nf-naming-code": "",
+      "nf-role": "",
+      "nf-type": "",
+      "nm-lan-v6-address": "",
+      "nm-profile-name": "",
+      "operational-status": "",
+      "orchestration-status": "ACTIVE",
+      "persona-model-version": "",
+      "prov-status": "PROV",
+      "regional-resource-subzone": "",
+      "regional-resource-zone": "",
+      "resource-version": "1559248669411",
+      "selflink": "",
+      "service-id": "",
+      "summary-status": "",
+      "vcpu": "",
+      "vcpu-units": "",
+      "vdisk": "",
+      "vdisk-units": "",
+      "vlan-id-outer": "",
+      "vmemory": "",
+      "vmemory-units": "",
+      "vnf-id": "generic-vnf-sprintathon-0-ABC890",
+      "vnf-name": "example-vnf-name-val-3979",
+      "vnf-name2": "",
+      "vnf-type": "vnf-type-att-sic",
+      "widget-model-id": "",
+      "widget-model-version": ""
+    },
+    "node-type": "generic-vnf",
+    "uri": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-sprintathon-0-ABC890"
+  },
+  {
+    "properties": {
+      "as-number": "",
+      "encrypted-access-flag": "",
+      "entitlement-assignment-group-uuid": "",
+      "entitlement-resource-uuid": "",
+      "equipment-role": "",
+      "heat-stack-id": "",
+      "in-maint": true,
+      "ipv4-loopback0-address": "ipv4-loopback0-address-ALL-GOOD-one",
+      "ipv4-oam-address": "",
+      "ipv4-oam-gateway-address": "",
+      "ipv4-oam-gateway-address-prefix-length": "",
+      "is-closed-loop-disabled": "",
+      "license-assignment-group-uuid": "",
+      "license-key": "",
+      "license-key-uuid": "",
+      "management-option": "",
+      "management-v6-address": "",
+      "model-customization-id": "",
+      "model-invariant-id": "",
+      "model-version-id": "",
+      "mso-catalog-key": "",
+      "nf-function": "",
+      "nf-naming-code": "",
+      "nf-role": "",
+      "nf-type": "",
+      "nm-lan-v6-address": "",
+      "nm-profile-name": "",
+      "operational-status": "",
+      "orchestration-status": "ACTIVE",
+      "persona-model-version": "",
+      "prov-status": "PROV",
+      "regional-resource-subzone": "",
+      "regional-resource-zone": "",
+      "resource-version": "1559248669411",
+      "selflink": "",
+      "service-id": "",
+      "summary-status": "",
+      "vcpu": "",
+      "vcpu-units": "",
+      "vdisk": "",
+      "vdisk-units": "",
+      "vlan-id-outer": "",
+      "vmemory": "",
+      "vmemory-units": "",
+      "vnf-id": "generic-vnf-sprintathon-0-ABC890",
+      "vnf-name": "example-vnf-name-val-3979",
+      "vnf-name2": "",
+      "vnf-type": "vnf-type-att-sic",
+      "widget-model-id": "",
+      "widget-model-version": ""
+    },
+    "node-type": "generic-vnf",
+    "uri": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-sprintathon-0-ABC890"
+  },
+  {
+    "properties": {
+      "as-number": "",
+      "encrypted-access-flag": "",
+      "entitlement-assignment-group-uuid": "",
+      "entitlement-resource-uuid": "",
+      "equipment-role": "",
+      "heat-stack-id": "",
+      "in-maint": true,
+      "ipv4-loopback0-address": "ipv4-loopback0-address-ALL-GOOD-one",
+      "ipv4-oam-address": "",
+      "ipv4-oam-gateway-address": "",
+      "ipv4-oam-gateway-address-prefix-length": "",
+      "is-closed-loop-disabled": "",
+      "license-assignment-group-uuid": "",
+      "license-key": "",
+      "license-key-uuid": "",
+      "management-option": "",
+      "management-v6-address": "",
+      "model-customization-id": "",
+      "model-invariant-id": "",
+      "model-version-id": "",
+      "mso-catalog-key": "",
+      "nf-function": "",
+      "nf-naming-code": "",
+      "nf-role": "",
+      "nf-type": "",
+      "nm-lan-v6-address": "",
+      "nm-profile-name": "",
+      "operational-status": "",
+      "orchestration-status": "ACTIVE",
+      "persona-model-version": "",
+      "prov-status": "PROV",
+      "regional-resource-subzone": "",
+      "regional-resource-zone": "",
+      "resource-version": "1559248669411",
+      "selflink": "",
+      "service-id": "",
+      "summary-status": "",
+      "vcpu": "",
+      "vcpu-units": "",
+      "vdisk": "",
+      "vdisk-units": "",
+      "vlan-id-outer": "",
+      "vmemory": "",
+      "vmemory-units": "",
+      "vnf-id": "generic-vnf-sprintathon-0-ABC890",
+      "vnf-name": "example-vnf-name-val-3979",
+      "vnf-name2": "",
+      "vnf-type": "vnf-type-att-sic",
+      "widget-model-id": "",
+      "widget-model-version": ""
+    },
+    "node-type": "generic-vnf",
+    "uri": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-sprintathon-0-ABC890"
+  },
+  {
+    "properties": {
+      "as-number": "",
+      "encrypted-access-flag": "",
+      "entitlement-assignment-group-uuid": "",
+      "entitlement-resource-uuid": "",
+      "equipment-role": "",
+      "heat-stack-id": "",
+      "in-maint": true,
+      "ipv4-loopback0-address": "ipv4-loopback0-address-ALL-GOOD-one",
+      "ipv4-oam-address": "",
+      "ipv4-oam-gateway-address": "",
+      "ipv4-oam-gateway-address-prefix-length": "",
+      "is-closed-loop-disabled": "",
+      "license-assignment-group-uuid": "",
+      "license-key": "",
+      "license-key-uuid": "",
+      "management-option": "",
+      "management-v6-address": "",
+      "model-customization-id": "",
+      "model-invariant-id": "",
+      "model-version-id": "",
+      "mso-catalog-key": "",
+      "nf-function": "",
+      "nf-naming-code": "",
+      "nf-role": "",
+      "nf-type": "",
+      "nm-lan-v6-address": "",
+      "nm-profile-name": "",
+      "operational-status": "",
+      "orchestration-status": "ACTIVE",
+      "persona-model-version": "",
+      "prov-status": "PROV",
+      "regional-resource-subzone": "",
+      "regional-resource-zone": "",
+      "resource-version": "1559248669411",
+      "selflink": "",
+      "service-id": "",
+      "summary-status": "",
+      "vcpu": "",
+      "vcpu-units": "",
+      "vdisk": "",
+      "vdisk-units": "",
+      "vlan-id-outer": "",
+      "vmemory": "",
+      "vmemory-units": "",
+      "vnf-id": "generic-vnf-sprintathon-0-ABC890",
+      "vnf-name": "example-vnf-name-val-3979",
+      "vnf-name2": "",
+      "vnf-type": "vnf-type-att-sic",
+      "widget-model-id": "",
+      "widget-model-version": ""
+    },
+    "node-type": "generic-vnf",
+    "uri": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-sprintathon-0-ABC890"
+  },
+  {
+    "properties": {
+      "disk-in-gigabytes": "",
+      "equip-model": "",
+      "equip-type": "",
+      "equip-vendor": "",
+      "fqdn": "",
+      "host-profile": "",
+      "hostname": "pserver-sprintathon-1-ABC890",
+      "in-maint": "",
+      "internet-topology": "",
+      "inv-status": "",
+      "ipaddress-v4-aim": "",
+      "ipaddress-v4-loopback-0": "",
+      "ipaddress-v6-aim": "",
+      "ipaddress-v6-loopback-0": "",
+      "ipaddress-v6-oam": "",
+      "ipv4-oam-address": "",
+      "management-option": "",
+      "number-of-cpus": "",
+      "prov-status": "",
+      "pserver-id": "",
+      "pserver-name2": "",
+      "pserver-selflink": "",
+      "ptnii-equip-name": "",
+      "purpose": "",
+      "ram-in-megabytes": "",
+      "resource-version": "1558031744715",
+      "serial-number": ""
+    },
+    "node-type": "pserver",
+    "uri": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-sprintathon-1-ABC890"
+  },
+  {
+    "properties": {
+      "disk-in-gigabytes": "",
+      "equip-model": "",
+      "equip-type": "",
+      "equip-vendor": "",
+      "fqdn": "",
+      "host-profile": "",
+      "hostname": "pserver-sprintathon-1-ABC890",
+      "in-maint": "",
+      "internet-topology": "",
+      "inv-status": "",
+      "ipaddress-v4-aim": "",
+      "ipaddress-v4-loopback-0": "",
+      "ipaddress-v6-aim": "",
+      "ipaddress-v6-loopback-0": "",
+      "ipaddress-v6-oam": "",
+      "ipv4-oam-address": "",
+      "management-option": "",
+      "number-of-cpus": "",
+      "prov-status": "",
+      "pserver-id": "",
+      "pserver-name2": "",
+      "pserver-selflink": "",
+      "ptnii-equip-name": "",
+      "purpose": "",
+      "ram-in-megabytes": "",
+      "resource-version": "1558031744715",
+      "serial-number": ""
+    },
+    "node-type": "pserver",
+    "uri": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-sprintathon-1-ABC890"
+  },
+  {
+    "properties": {
+      "disk-in-gigabytes": "",
+      "equip-model": "",
+      "equip-type": "",
+      "equip-vendor": "",
+      "fqdn": "",
+      "host-profile": "",
+      "hostname": "pserver-sprintathon-1-ABC890",
+      "in-maint": "",
+      "internet-topology": "",
+      "inv-status": "",
+      "ipaddress-v4-aim": "",
+      "ipaddress-v4-loopback-0": "",
+      "ipaddress-v6-aim": "",
+      "ipaddress-v6-loopback-0": "",
+      "ipaddress-v6-oam": "",
+      "ipv4-oam-address": "",
+      "management-option": "",
+      "number-of-cpus": "",
+      "prov-status": "",
+      "pserver-id": "",
+      "pserver-name2": "",
+      "pserver-selflink": "",
+      "ptnii-equip-name": "",
+      "purpose": "",
+      "ram-in-megabytes": "",
+      "resource-version": "1558031744715",
+      "serial-number": ""
+    },
+    "node-type": "pserver",
+    "uri": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-sprintathon-1-ABC890"
+  },
+  {
+    "properties": {
+      "city": "Test-City",
+      "complex-name": "complex-name-test-sprintathon-11",
+      "country": "Test-Country",
+      "data-center-code": "test-sprintathon-11",
+      "elevation": "95",
+      "identity-url": "",
+      "lata": "example-lata-val-2652",
+      "latitude": "example-latitude-val-2652",
+      "longitude": "example-longitude-val-2652",
+      "physical-location-id": "complex-sprintathon-1-ABC890",
+      "physical-location-type": "test-lab",
+      "postal-code": "12345",
+      "region": "test-region",
+      "resource-version": "1558031745028",
+      "state": "TS",
+      "street1": "Test Street 1",
+      "street2": "Test Street 2"
+    },
+    "node-type": "complex",
+    "uri": "/aai/v15/cloud-infrastructure/complexes/complex/complex-sprintathon-1-ABC890"
+  }
+]
diff --git a/src/app/assets/stubs/BYOQCommunityQueries.json b/src/app/assets/stubs/BYOQCommunityQueries.json
new file mode 100644
index 0000000..fe51488
--- /dev/null
+++ b/src/app/assets/stubs/BYOQCommunityQueries.json
@@ -0,0 +1 @@
+[]
diff --git a/src/app/assets/stubs/BYOQDefault.json b/src/app/assets/stubs/BYOQDefault.json
new file mode 100644
index 0000000..ce121da
--- /dev/null
+++ b/src/app/assets/stubs/BYOQDefault.json
@@ -0,0 +1,147 @@
+{
+  "results": [
+    {
+      "id": "16632",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+      "properties": {
+        "vnf-id": "generic-vnf-test-0-ABC890",
+        "vnf-name": "example-vnf-name-val-3979",
+        "vnf-type": "vnf-type-onap-sic",
+        "prov-status": "PROV",
+        "orchestration-status": "ACTIVE",
+        "ipv4-loopback0-address": "ipv4-loopback0-address-ALL-GOOD-one",
+        "in-maint": true,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1559248669411"
+      },
+      "related-to": [
+        {
+          "id": "24712",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "entitlement",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/entitlements/entitlement/entitlement-test-21-ABC890/entitlement-test-22-ABC890"
+        },
+        {
+          "id": "28696",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "license",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/licenses/license/license-test-1-ABC890/license-test-2-ABC890"
+        },
+        {
+          "id": "16584",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890"
+        },
+        {
+          "id": "28864",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "28696",
+      "node-type": "license",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/licenses/license/license-test-1-ABC890/license-test-2-ABC890",
+      "properties": {
+        "group-uuid": "license-test-1-ABC890",
+        "resource-uuid": "license-test-2-ABC890",
+        "resource-version": "1558031870257"
+      },
+      "related-to": [
+        {
+          "id": "16632",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "24712",
+      "node-type": "entitlement",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/entitlements/entitlement/entitlement-test-21-ABC890/entitlement-test-22-ABC890",
+      "properties": {
+        "group-uuid": "entitlement-test-21-ABC890",
+        "resource-uuid": "entitlement-test-22-ABC890",
+        "resource-version": "1558031901455"
+      },
+      "related-to": [
+        {
+          "id": "16632",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "28864",
+      "node-type": "pserver",
+      "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890",
+      "properties": {
+        "hostname": "pserver-test-1-ABC890",
+        "in-maint": false,
+        "resource-version": "1558031744715"
+      },
+      "related-to": [
+        {
+          "id": "16584",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890"
+        },
+        {
+          "id": "16632",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890"
+        },
+        {
+          "id": "24600",
+          "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+          "node-type": "complex",
+          "url": "/aai/v15/cloud-infrastructure/complexes/complex/complex-test-1-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "16584",
+      "node-type": "vserver",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890",
+      "properties": {
+        "vserver-id": "vserver-test-3-ABC890",
+        "vserver-name": "example-vserver-name-val-30739",
+        "vserver-name2": "example-vserver-name2-val-67128",
+        "prov-status": "PROV",
+        "vserver-selflink": "example-vserver-selflink-val-66843",
+        "in-maint": true,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1558031746466"
+      },
+      "related-to": [
+        {
+          "id": "16632",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890"
+        },
+        {
+          "id": "20728",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "tenant",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890"
+        },
+        {
+          "id": "28864",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890"
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/app/assets/stubs/BYOQDefaultError.json b/src/app/assets/stubs/BYOQDefaultError.json
new file mode 100644
index 0000000..267563f
--- /dev/null
+++ b/src/app/assets/stubs/BYOQDefaultError.json
@@ -0,0 +1,7 @@
+{
+  "message": "DSL Query Error:DSL Syntax Error while processing the query :line 1:0 mismatched input '<EOF>' expecting {NUM, ID}",
+  "details": "uri=/proxy/aai/v15/dsl",
+  "statusType": "NOT_FOUND",
+  "status": "404",
+  "date": "Thu 2019.08.01 at 09:14:51 PM EDT"
+}
\ No newline at end of file
diff --git a/src/app/assets/stubs/BYOQDeleteQuery.json b/src/app/assets/stubs/BYOQDeleteQuery.json
new file mode 100644
index 0000000..f301e64
--- /dev/null
+++ b/src/app/assets/stubs/BYOQDeleteQuery.json
@@ -0,0 +1 @@
+{"status":"201"}
\ No newline at end of file
diff --git a/src/app/assets/stubs/BYOQLargeSet.json b/src/app/assets/stubs/BYOQLargeSet.json
new file mode 100644
index 0000000..05842a6
--- /dev/null
+++ b/src/app/assets/stubs/BYOQLargeSet.json
@@ -0,0 +1,1731 @@
+{
+  "results": [
+    {
+      "id": "12440",
+      "node-type": "vserver",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-1-EFG567/cr-test-2-EFG567/tenants/tenant/tenant-test-1-EFG567/vservers/vserver/vserver-test-1-EFG567",
+      "properties": {
+        "vserver-id": "vserver-test-1-EFG567",
+        "vserver-name": "example-vserver-name-val-30739",
+        "vserver-name2": "example-vserver-name2-val-67128",
+        "prov-status": "PROV",
+        "vserver-selflink": "example-vserver-selflink-val-66843",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1557861887797"
+      },
+      "related-to": [
+        {
+          "id": "8216",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "tenant",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-1-EFG567/cr-test-2-EFG567/tenants/tenant/tenant-test-1-EFG567"
+        }
+      ]
+    },
+    {
+      "id": "32920",
+      "node-type": "cloud-region",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/onap-demo-aic/cr-demo-1",
+      "properties": {
+        "cloud-owner": "onap-demo-aic",
+        "cloud-region-id": "cr-demo-1",
+        "cloud-type": "open-stack-1",
+        "owner-defined-type": "example-owner-defined-type-val-94072",
+        "cloud-region-version": "cloud-region-version-val-1",
+        "identity-url": "example-identity-url-val-74657",
+        "cloud-zone": "example-cloud-zone-val-17598",
+        "complex-name": "example-complex-name-val-55430",
+        "sriov-automation": "true",
+        "resource-version": "1559204135965"
+      },
+      "related-to": [
+        {
+          "id": "28872",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "tenant",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/onap-demo-aic/cr-demo-1/tenants/tenant/tenant-demo-1"
+        }
+      ]
+    },
+    {
+      "id": "41112",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-demo1",
+      "properties": {
+        "vnf-id": "generic-vnf-demo1",
+        "vnf-type": "example-vnf-type-val-3979-generic-vnf-demo1",
+        "prov-status": "IN-MAINT",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1559204957136"
+      },
+      "related-to": [
+        {
+          "id": "53264",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-demo-1"
+        }
+      ]
+    },
+    {
+      "id": "4248",
+      "node-type": "entitlement",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-DEF321/entitlements/entitlement/entitlement-test-21-DEF321/entitlement-test-22-DEF321",
+      "properties": {
+        "group-uuid": "entitlement-test-21-DEF321",
+        "resource-uuid": "entitlement-test-22-DEF321",
+        "resource-version": "1557779908789"
+      },
+      "related-to": [
+        {
+          "id": "4288",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-DEF321"
+        }
+      ]
+    },
+    {
+      "id": "20728",
+      "node-type": "tenant",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890",
+      "properties": {
+        "tenant-id": "tenant-test-3-ABC890",
+        "tenant-name": "tenant-name-test-02",
+        "resource-version": "1558031745643"
+      },
+      "related-to": [
+        {
+          "id": "16584",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890"
+        },
+        {
+          "id": "32784",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "cloud-region",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "49168",
+      "node-type": "service-subscription",
+      "url": "/aai/v15/business/customers/customer/customer-test-2-ABC898/service-subscriptions/service-subscription/service-subscription-test-2-ABC898",
+      "properties": {
+        "service-type": "service-subscription-test-2-ABC898",
+        "resource-version": "1558032250686"
+      },
+      "related-to": [
+        {
+          "id": "24784",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "service-instance",
+          "url": "/aai/v15/business/customers/customer/customer-test-2-ABC898/service-subscriptions/service-subscription/service-subscription-test-2-ABC898/service-instances/service-instance/service-instance-test-2-ABC898"
+        },
+        {
+          "id": "45072",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "customer",
+          "url": "/aai/v15/business/customers/customer/customer-test-2-ABC898"
+        }
+      ]
+    },
+    {
+      "id": "4312",
+      "node-type": "pserver",
+      "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-DEF321",
+      "properties": {
+        "hostname": "pserver-test-1-DEF321",
+        "in-maint": false,
+        "resource-version": "1557779752363"
+      },
+      "related-to": [
+        {
+          "id": "4288",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-DEF321"
+        },
+        {
+          "id": "4120",
+          "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+          "node-type": "complex",
+          "url": "/aai/v15/cloud-infrastructure/complexes/complex/complex-test-1-DEF321"
+        }
+      ]
+    },
+    {
+      "id": "20672",
+      "node-type": "network-profile",
+      "url": "/aai/v15/cloud-infrastructure/network-profiles/network-profile/nm-profile234ABC123",
+      "properties": {
+        "nm-profile-name": "nm-profile234ABC123",
+        "community-string": "pKFGQ8L",
+        "resource-version": "1558026194820"
+      },
+      "related-to": [
+        {
+          "id": "16600",
+          "relationship-label": "org.onap.relationships.inventory.AppliesTo",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123"
+        }
+      ]
+    },
+    {
+      "id": "4344",
+      "node-type": "pserver",
+      "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABCD1234",
+      "properties": {
+        "hostname": "pserver-test-1-ABCD1234",
+        "in-maint": false,
+        "resource-version": "1557782182831"
+      },
+      "related-to": [
+        {
+          "id": "12488",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABCD1234"
+        },
+        {
+          "id": "4304",
+          "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+          "node-type": "complex",
+          "url": "/aai/v15/cloud-infrastructure/complexes/complex/complex-test-1-ABCD1234"
+        }
+      ]
+    },
+    {
+      "id": "40976",
+      "node-type": "tenant",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC898/cr-test-4-ABC898/tenants/tenant/tenant-test-2-ABC898",
+      "properties": {
+        "tenant-id": "tenant-test-2-ABC898",
+        "tenant-name": "tenant-name-test-02",
+        "resource-version": "1558032234242"
+      },
+      "related-to": [
+        {
+          "id": "28808",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC898/cr-test-4-ABC898/tenants/tenant/tenant-test-2-ABC898/vservers/vserver/vserver-test-2-ABC898"
+        },
+        {
+          "id": "8288",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "cloud-region",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC898/cr-test-4-ABC898"
+        }
+      ]
+    },
+    {
+      "id": "4112",
+      "node-type": "license",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-DEF321/licenses/license/license-test-1-DEF321/license-test-2-DEF321",
+      "properties": {
+        "group-uuid": "license-test-1-DEF321",
+        "resource-uuid": "license-test-2-DEF321",
+        "resource-version": "1557779877260"
+      },
+      "related-to": [
+        {
+          "id": "4288",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-DEF321"
+        }
+      ]
+    },
+    {
+      "id": "53264",
+      "node-type": "pserver",
+      "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-demo-1",
+      "properties": {
+        "hostname": "pserver-demo-1",
+        "in-maint": true,
+        "resource-version": "1559206657975"
+      },
+      "related-to": [
+        {
+          "id": "32792",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/onap-demo-aic/cr-demo/tenants/tenant/tenant-demo-1/vservers/vserver/vserver-demo"
+        },
+        {
+          "id": "41112",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-demo1"
+        },
+        {
+          "id": "45208",
+          "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+          "node-type": "complex",
+          "url": "/aai/v15/cloud-infrastructure/complexes/complex/complex-demo-1"
+        }
+      ]
+    },
+    {
+      "id": "12504",
+      "node-type": "service-instance",
+      "url": "/aai/v15/business/customers/customer/customer-test-2-ABC321/service-subscriptions/service-subscription/service-subscription-test-2-ABC321/service-instances/service-instance/service-instance-test-2-ABC321",
+      "properties": {
+        "service-instance-id": "service-instance-test-2-ABC321",
+        "resource-version": "1557862849358"
+      },
+      "related-to": [
+        {
+          "id": "12480",
+          "relationship-label": "org.onap.relationships.inventory.ComposedOf",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-50-ABC321"
+        },
+        {
+          "id": "12304",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "service-subscription",
+          "url": "/aai/v15/business/customers/customer/customer-test-2-ABC321/service-subscriptions/service-subscription/service-subscription-test-2-ABC321"
+        }
+      ]
+    },
+    {
+      "id": "24824",
+      "node-type": "vnfc",
+      "url": "/aai/v15/network/vnfcs/vnfc/vnfc-test-2-ABC898",
+      "properties": {
+        "vnfc-name": "vnfc-test-2-ABC898",
+        "nfc-naming-code": "example-vnfc-function-code-val-69324-2",
+        "nfc-function": "example-vnfc-type-val-25880-2",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1558032266582"
+      },
+      "related-to": [
+        {
+          "id": "37056",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-50-ABC898"
+        }
+      ]
+    },
+    {
+      "id": "16592",
+      "node-type": "vnfc",
+      "url": "/aai/v15/network/vnfcs/vnfc/vnfc-test-1-ABC321",
+      "properties": {
+        "vnfc-name": "vnfc-test-1-ABC321",
+        "nfc-naming-code": "example-vnfc-function-code-val-69324",
+        "nfc-function": "example-vnfc-type-val-25880",
+        "in-maint": true,
+        "is-closed-loop-disabled": true,
+        "resource-version": "1557862848802"
+      },
+      "related-to": [
+        {
+          "id": "12480",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-50-ABC321"
+        }
+      ]
+    },
+    {
+      "id": "4232",
+      "node-type": "cloud-region",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-1-EFG567/cr-test-2-EFG567",
+      "properties": {
+        "cloud-owner": "cr-test-1-EFG567",
+        "cloud-region-id": "cr-test-2-EFG567",
+        "cloud-type": "example-cloud-type-val-93696",
+        "owner-defined-type": "example-owner-defined-type-val-16874",
+        "cloud-region-version": "example-cloud-region-version-val-20485",
+        "identity-url": "example-identity-url-val-31885",
+        "cloud-zone": "example-cloud-zone-val-42889",
+        "complex-name": "example-complex-name-val-13802",
+        "resource-version": "1557861810634"
+      },
+      "related-to": [
+        {
+          "id": "8216",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "tenant",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-1-EFG567/cr-test-2-EFG567/tenants/tenant/tenant-test-1-EFG567"
+        }
+      ]
+    },
+    {
+      "id": "28688",
+      "node-type": "lag-interface",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/lag-interfaces/lag-interface/lagintergace-test01ABC123",
+      "properties": {
+        "interface-name": "lagintergace-test01ABC123",
+        "interface-description": "XSOR",
+        "resource-version": "1558026222099",
+        "speed-value": "0Oj",
+        "speed-units": "RKKRBFy1ykl",
+        "interface-id": "JpqQrN",
+        "interface-role": "ETx0i9QKVYIl",
+        "prov-status": "Bj7ur0n2F4wF",
+        "in-maint": false
+      },
+      "related-to": [
+        {
+          "id": "16600",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123"
+        }
+      ]
+    },
+    {
+      "id": "16536",
+      "node-type": "customer",
+      "url": "/aai/v15/business/customers/customer/customer-test-2-ABC321",
+      "properties": {
+        "global-customer-id": "customer-test-2-ABC321",
+        "subscriber-name": "subscriber-name-test-01",
+        "subscriber-type": "subscriber-type-test-01",
+        "resource-version": "1557862833247"
+      },
+      "related-to": [
+        {
+          "id": "12304",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "service-subscription",
+          "url": "/aai/v15/business/customers/customer/customer-test-2-ABC321/service-subscriptions/service-subscription/service-subscription-test-2-ABC321"
+        }
+      ]
+    },
+    {
+      "id": "37056",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-50-ABC898",
+      "properties": {
+        "vnf-id": "generic-vnf-test-50-ABC898",
+        "vnf-name": "example-vnf-name-val-3979-2",
+        "vnf-type": "example-vnf-type-val-3979-2",
+        "prov-status": "ACTIVE",
+        "orchestration-status": "orchestration-status-2",
+        "ipv4-loopback0-address": "ipv4-loopback0-address-2",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1558032266879"
+      },
+      "related-to": [
+        {
+          "id": "24784",
+          "relationship-label": "org.onap.relationships.inventory.ComposedOf",
+          "node-type": "service-instance",
+          "url": "/aai/v15/business/customers/customer/customer-test-2-ABC898/service-subscriptions/service-subscription/service-subscription-test-2-ABC898/service-instances/service-instance/service-instance-test-2-ABC898"
+        },
+        {
+          "id": "24824",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "vnfc",
+          "url": "/aai/v15/network/vnfcs/vnfc/vnfc-test-2-ABC898"
+        },
+        {
+          "id": "32960",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "vnfc",
+          "url": "/aai/v15/network/vnfcs/vnfc/vnfc-test-1-ABC898"
+        },
+        {
+          "id": "28808",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC898/cr-test-4-ABC898/tenants/tenant/tenant-test-2-ABC898/vservers/vserver/vserver-test-2-ABC898"
+        }
+      ]
+    },
+    {
+      "id": "16600",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123",
+      "properties": {
+        "vnf-id": "generic-vnfABC123",
+        "vnf-type": "example-vnf-type-val-3979-soumya",
+        "prov-status": "ACTIVE-NO",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1558031116089"
+      },
+      "related-to": [
+        {
+          "id": "20672",
+          "relationship-label": "org.onap.relationships.inventory.AppliesTo",
+          "node-type": "network-profile",
+          "url": "/aai/v15/cloud-infrastructure/network-profiles/network-profile/nm-profile234ABC123"
+        },
+        {
+          "id": "16576",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "l-interface",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/l-interfaces/l-interface/linterface-keyABC123"
+        },
+        {
+          "id": "28688",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "lag-interface",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/lag-interfaces/lag-interface/lagintergace-test01ABC123"
+        },
+        {
+          "id": "24728",
+          "relationship-label": "org.onap.relationships.inventory.Uses",
+          "node-type": "vnf-image",
+          "url": "/aai/v15/service-design-and-creation/vnf-images/vnf-image/image123-testABC123"
+        }
+      ]
+    },
+    {
+      "id": "24712",
+      "node-type": "entitlement",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/entitlements/entitlement/entitlement-test-21-ABC890/entitlement-test-22-ABC890",
+      "properties": {
+        "group-uuid": "entitlement-test-21-ABC890",
+        "resource-uuid": "entitlement-test-22-ABC890",
+        "resource-version": "1558031901455"
+      },
+      "related-to": [
+        {
+          "id": "16632",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "8400",
+      "node-type": "entitlement",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABCD1234/entitlements/entitlement/entitlement-test-21-ABCD1234/entitlement-test-22-ABCD1234",
+      "properties": {
+        "group-uuid": "entitlement-test-21-ABCD1234",
+        "resource-uuid": "entitlement-test-22-ABCD1234",
+        "resource-version": "1557782337545"
+      },
+      "related-to": [
+        {
+          "id": "12488",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABCD1234"
+        }
+      ]
+    },
+    {
+      "id": "20616",
+      "node-type": "l3-interface-ipv6-address-list",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/l-interfaces/l-interface/linterface-keyABC123/vlans/vlan/vlan-interface01ABC123/l3-interface-ipv6-address-list/vlan-ipv6-address01ABC123",
+      "properties": {
+        "l3-interface-ipv6-address": "vlan-ipv6-address01ABC123",
+        "l3-interface-ipv6-prefix-length": 279,
+        "vlan-id-inner": 434,
+        "vlan-id-outer": 681,
+        "is-floating": false,
+        "resource-version": "1558026232915",
+        "neutron-network-id": "zd0qx",
+        "neutron-subnet-id": "seyUc0A"
+      },
+      "related-to": [
+        {
+          "id": "20688",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "vlan",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/l-interfaces/l-interface/linterface-keyABC123/vlans/vlan/vlan-interface01ABC123"
+        }
+      ]
+    },
+    {
+      "id": "45072",
+      "node-type": "customer",
+      "url": "/aai/v15/business/customers/customer/customer-test-2-ABC898",
+      "properties": {
+        "global-customer-id": "customer-test-2-ABC898",
+        "subscriber-name": "subscriber-name-test-01",
+        "subscriber-type": "subscriber-type-test-01",
+        "resource-version": "1558032250428"
+      },
+      "related-to": [
+        {
+          "id": "49168",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "service-subscription",
+          "url": "/aai/v15/business/customers/customer/customer-test-2-ABC898/service-subscriptions/service-subscription/service-subscription-test-2-ABC898"
+        }
+      ]
+    },
+    {
+      "id": "16520",
+      "node-type": "vserver",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC321/cr-test-4-ABC321/tenants/tenant/tenant-test-2-ABC321/vservers/vserver/vserver-test-2-ABC321",
+      "properties": {
+        "vserver-id": "vserver-test-2-ABC321",
+        "vserver-name": "example-vserver-name-val-30739",
+        "vserver-name2": "example-vserver-name2-val-67128",
+        "prov-status": "PROV",
+        "vserver-selflink": "example-vserver-selflink-val-66843",
+        "in-maint": true,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1557862849507"
+      },
+      "related-to": [
+        {
+          "id": "12480",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-50-ABC321"
+        },
+        {
+          "id": "8384",
+          "relationship-label": "tosca.relationships.network.BindsTo",
+          "node-type": "l-interface",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC321/cr-test-4-ABC321/tenants/tenant/tenant-test-2-ABC321/vservers/vserver/vserver-test-2-ABC321/l-interfaces/l-interface/l-interface-test-2-ABC321"
+        },
+        {
+          "id": "12424",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "tenant",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC321/cr-test-4-ABC321/tenants/tenant/tenant-test-2-ABC321"
+        },
+        {
+          "id": "12496",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-2-ABC321"
+        }
+      ]
+    },
+    {
+      "id": "16400",
+      "node-type": "cloud-region",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/onap-new-aic/newRegId1",
+      "properties": {
+        "cloud-owner": "onap-new-aic",
+        "cloud-region-id": "newRegId1",
+        "cloud-type": "open-stack-1",
+        "owner-defined-type": "example-owner-defined-type-val-94072",
+        "cloud-region-version": "cloud-region-version-val-1",
+        "identity-url": "example-identity-url-val-74657",
+        "cloud-zone": "example-cloud-zone-val-17598",
+        "complex-name": "example-complex-name-val-55430",
+        "sriov-automation": "true",
+        "resource-version": "1557865494492"
+      },
+      "related-to": [
+        {
+          "id": "4192",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "tenant",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/onap-new-aic/newRegId1/tenants/tenant/tenant-newTest-8641-example"
+        }
+      ]
+    },
+    {
+      "id": "12312",
+      "node-type": "complex",
+      "url": "/aai/v15/cloud-infrastructure/complexes/complex/complex-test-2-ABC321",
+      "properties": {
+        "physical-location-id": "complex-test-2-ABC321",
+        "data-center-code": "test-cityil-test-22",
+        "complex-name": "complex-name-test-cityil-test-22",
+        "resource-version": "1557862802171",
+        "physical-location-type": "test-city-lab",
+        "street1": "test-street",
+        "street2": "test-street",
+        "city": "test-city",
+        "state": "test-state",
+        "postal-code": "12345",
+        "country": "test-country",
+        "region": "test-region",
+        "latitude": "example-latitude-val-2652",
+        "longitude": "example-longitude-val-2652",
+        "elevation": "95",
+        "lata": "example-lata-val-2652"
+      },
+      "related-to": [
+        {
+          "id": "12496",
+          "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-2-ABC321"
+        }
+      ]
+    },
+    {
+      "id": "16576",
+      "node-type": "l-interface",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/l-interfaces/l-interface/linterface-keyABC123",
+      "properties": {
+        "interface-name": "linterface-keyABC123",
+        "interface-role": "example-interface-role-val-9965",
+        "is-port-mirrored": false,
+        "resource-version": "1558026216400",
+        "in-maint": false,
+        "is-ip-unnumbered": false
+      },
+      "related-to": [
+        {
+          "id": "12536",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "l3-interface-ipv6-address-list",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/l-interfaces/l-interface/linterface-keyABC123/l3-interface-ipv6-address-list/lint-ipv6addressABC123"
+        },
+        {
+          "id": "24592",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "l3-interface-ipv4-address-list",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/l-interfaces/l-interface/linterface-keyABC123/l3-interface-ipv4-address-list/lint-ipv4addressABC123"
+        },
+        {
+          "id": "20688",
+          "relationship-label": "tosca.relationships.network.LinksTo",
+          "node-type": "vlan",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/l-interfaces/l-interface/linterface-keyABC123/vlans/vlan/vlan-interface01ABC123"
+        },
+        {
+          "id": "16600",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123"
+        }
+      ]
+    },
+    {
+      "id": "28696",
+      "node-type": "license",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/licenses/license/license-test-1-ABC890/license-test-2-ABC890",
+      "properties": {
+        "group-uuid": "license-test-1-ABC890",
+        "resource-uuid": "license-test-2-ABC890",
+        "resource-version": "1558031870257"
+      },
+      "related-to": [
+        {
+          "id": "16632",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "20496",
+      "node-type": "vserver",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/onap-new-aic/newRegId1/tenants/tenant/tenant-newTest-8641-example/vservers/vserver/959798c2-f024-4db5-af72-9860775ab80e-example",
+      "properties": {
+        "vserver-id": "959798c2-f024-4db5-af72-9860775ab80e-example",
+        "vserver-name": "txalle3ravpmaa1",
+        "vserver-name2": "TXALLE3RAVPMAA1-blah3",
+        "prov-status": "tr",
+        "vserver-selflink": "https://test.com:8774/v2/332775c7707b44b7bc990884f97a2366/servers/959798c2-f024-4db5-af72-9860775ab80e-example",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1557866370539"
+      },
+      "related-to": [
+        {
+          "id": "4192",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "tenant",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/onap-new-aic/newRegId1/tenants/tenant/tenant-newTest-8641-example"
+        }
+      ]
+    },
+    {
+      "id": "20680",
+      "node-type": "pserver",
+      "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-2-ABC898",
+      "properties": {
+        "hostname": "pserver-test-2-ABC898",
+        "in-maint": false,
+        "resource-version": "1558032218349"
+      },
+      "related-to": [
+        {
+          "id": "28808",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC898/cr-test-4-ABC898/tenants/tenant/tenant-test-2-ABC898/vservers/vserver/vserver-test-2-ABC898"
+        },
+        {
+          "id": "36880",
+          "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+          "node-type": "complex",
+          "url": "/aai/v15/cloud-infrastructure/complexes/complex/complex-test-2-ABC898"
+        }
+      ]
+    },
+    {
+      "id": "28808",
+      "node-type": "vserver",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC898/cr-test-4-ABC898/tenants/tenant/tenant-test-2-ABC898/vservers/vserver/vserver-test-2-ABC898",
+      "properties": {
+        "vserver-id": "vserver-test-2-ABC898",
+        "vserver-name": "example-vserver-name-val-30739",
+        "vserver-name2": "example-vserver-name2-val-67128",
+        "prov-status": "PROV",
+        "vserver-selflink": "example-vserver-selflink-val-66843",
+        "in-maint": true,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1558032267461"
+      },
+      "related-to": [
+        {
+          "id": "37056",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-50-ABC898"
+        },
+        {
+          "id": "32904",
+          "relationship-label": "tosca.relationships.network.BindsTo",
+          "node-type": "l-interface",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC898/cr-test-4-ABC898/tenants/tenant/tenant-test-2-ABC898/vservers/vserver/vserver-test-2-ABC898/l-interfaces/l-interface/l-interface-test-2-ABC898"
+        },
+        {
+          "id": "40976",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "tenant",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC898/cr-test-4-ABC898/tenants/tenant/tenant-test-2-ABC898"
+        },
+        {
+          "id": "20680",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-2-ABC898"
+        }
+      ]
+    },
+    {
+      "id": "8216",
+      "node-type": "tenant",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-1-EFG567/cr-test-2-EFG567/tenants/tenant/tenant-test-1-EFG567",
+      "properties": {
+        "tenant-id": "tenant-test-1-EFG567",
+        "tenant-name": "tenant-name-test-02",
+        "resource-version": "1557861811615"
+      },
+      "related-to": [
+        {
+          "id": "12440",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-1-EFG567/cr-test-2-EFG567/tenants/tenant/tenant-test-1-EFG567/vservers/vserver/vserver-test-1-EFG567"
+        },
+        {
+          "id": "4232",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "cloud-region",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-1-EFG567/cr-test-2-EFG567"
+        }
+      ]
+    },
+    {
+      "id": "12536",
+      "node-type": "l3-interface-ipv6-address-list",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/l-interfaces/l-interface/linterface-keyABC123/l3-interface-ipv6-address-list/lint-ipv6addressABC123",
+      "properties": {
+        "l3-interface-ipv6-address": "lint-ipv6addressABC123",
+        "l3-interface-ipv6-prefix-length": 279,
+        "vlan-id-inner": 245,
+        "vlan-id-outer": 293,
+        "is-floating": true,
+        "resource-version": "1558026217589",
+        "neutron-network-id": "nS0RYB",
+        "neutron-subnet-id": "bYhOGipdF"
+      },
+      "related-to": [
+        {
+          "id": "16576",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "l-interface",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/l-interfaces/l-interface/linterface-keyABC123"
+        }
+      ]
+    },
+    {
+      "id": "32904",
+      "node-type": "l-interface",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC898/cr-test-4-ABC898/tenants/tenant/tenant-test-2-ABC898/vservers/vserver/vserver-test-2-ABC898/l-interfaces/l-interface/l-interface-test-2-ABC898",
+      "properties": {
+        "interface-name": "l-interface-test-2-ABC898",
+        "interface-role": "example-interface-role-val-8875",
+        "is-port-mirrored": false,
+        "resource-version": "1558032234825",
+        "in-maint": false,
+        "is-ip-unnumbered": false
+      },
+      "related-to": [
+        {
+          "id": "28808",
+          "relationship-label": "tosca.relationships.network.BindsTo",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC898/cr-test-4-ABC898/tenants/tenant/tenant-test-2-ABC898/vservers/vserver/vserver-test-2-ABC898"
+        }
+      ]
+    },
+    {
+      "id": "24768",
+      "node-type": "l3-interface-ipv4-address-list",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/l-interfaces/l-interface/linterface-keyABC123/vlans/vlan/vlan-interface01ABC123/l3-interface-ipv4-address-list/vlan-ipv6-address01ABC123",
+      "properties": {
+        "l3-interface-ipv4-address": "vlan-ipv6-address01ABC123",
+        "l3-interface-ipv4-prefix-length": 597,
+        "vlan-id-inner": 782,
+        "vlan-id-outer": 531,
+        "is-floating": true,
+        "resource-version": "1558026227621",
+        "neutron-network-id": "CltxRWXt3DLak",
+        "neutron-subnet-id": "KTsBYxU1LvZ"
+      },
+      "related-to": [
+        {
+          "id": "20688",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "vlan",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/l-interfaces/l-interface/linterface-keyABC123/vlans/vlan/vlan-interface01ABC123"
+        }
+      ]
+    },
+    {
+      "id": "24592",
+      "node-type": "l3-interface-ipv4-address-list",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/l-interfaces/l-interface/linterface-keyABC123/l3-interface-ipv4-address-list/lint-ipv4addressABC123",
+      "properties": {
+        "l3-interface-ipv4-address": "lint-ipv4addressABC123",
+        "l3-interface-ipv4-prefix-length": 110,
+        "vlan-id-inner": 53,
+        "vlan-id-outer": 686,
+        "is-floating": true,
+        "resource-version": "1558026216993",
+        "neutron-network-id": "lStCDrB9pp",
+        "neutron-subnet-id": "2PmMrQCLErF"
+      },
+      "related-to": [
+        {
+          "id": "16576",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "l-interface",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/l-interfaces/l-interface/linterface-keyABC123"
+        }
+      ]
+    },
+    {
+      "id": "32784",
+      "node-type": "cloud-region",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890",
+      "properties": {
+        "cloud-owner": "cr-test-5-ABC890",
+        "cloud-region-id": "cr-test-6-ABC890",
+        "cloud-type": "example-cloud-type-val-93696",
+        "owner-defined-type": "example-owner-defined-type-val-16874",
+        "cloud-region-version": "example-cloud-region-version-val-20485",
+        "identity-url": "example-identity-url-val-31885",
+        "cloud-zone": "example-cloud-zone-val-42889",
+        "complex-name": "example-complex-name-val-13802",
+        "resource-version": "1558031745363"
+      },
+      "related-to": [
+        {
+          "id": "20728",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "tenant",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "4304",
+      "node-type": "complex",
+      "url": "/aai/v15/cloud-infrastructure/complexes/complex/complex-test-1-ABCD1234",
+      "properties": {
+        "physical-location-id": "complex-test-1-ABCD1234",
+        "data-center-code": "test-cityil-test-11",
+        "complex-name": "complex-name-test-cityil-test-11",
+        "resource-version": "1557782183690",
+        "physical-location-type": "test-city-lab",
+        "street1": "test-street",
+        "street2": "test-street",
+        "city": "test-city",
+        "state": "test-state",
+        "postal-code": "12345",
+        "country": "test-country",
+        "region": "test-region",
+        "latitude": "example-latitude-val-2652",
+        "longitude": "example-longitude-val-2652",
+        "elevation": "95",
+        "lata": "example-lata-val-2652"
+      },
+      "related-to": [
+        {
+          "id": "4344",
+          "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABCD1234"
+        }
+      ]
+    },
+    {
+      "id": "12304",
+      "node-type": "service-subscription",
+      "url": "/aai/v15/business/customers/customer/customer-test-2-ABC321/service-subscriptions/service-subscription/service-subscription-test-2-ABC321",
+      "properties": {
+        "service-type": "service-subscription-test-2-ABC321",
+        "resource-version": "1557862833422"
+      },
+      "related-to": [
+        {
+          "id": "12504",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "service-instance",
+          "url": "/aai/v15/business/customers/customer/customer-test-2-ABC321/service-subscriptions/service-subscription/service-subscription-test-2-ABC321/service-instances/service-instance/service-instance-test-2-ABC321"
+        },
+        {
+          "id": "16536",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "customer",
+          "url": "/aai/v15/business/customers/customer/customer-test-2-ABC321"
+        }
+      ]
+    },
+    {
+      "id": "12424",
+      "node-type": "tenant",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC321/cr-test-4-ABC321/tenants/tenant/tenant-test-2-ABC321",
+      "properties": {
+        "tenant-id": "tenant-test-2-ABC321",
+        "tenant-name": "tenant-name-test-02",
+        "resource-version": "1557862817508"
+      },
+      "related-to": [
+        {
+          "id": "16520",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC321/cr-test-4-ABC321/tenants/tenant/tenant-test-2-ABC321/vservers/vserver/vserver-test-2-ABC321"
+        },
+        {
+          "id": "8328",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "cloud-region",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC321/cr-test-4-ABC321"
+        }
+      ]
+    },
+    {
+      "id": "12488",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABCD1234",
+      "properties": {
+        "vnf-id": "generic-vnf-test-0-ABCD1234",
+        "vnf-name": "example-vnf-name-val-3979",
+        "vnf-type": "example-vnf-type-val-3979",
+        "prov-status": "PROV",
+        "orchestration-status": "ALL-GOOD-orchestration-status",
+        "ipv4-loopback0-address": "ipv4-loopback0-address-ALL-GOOD-one",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1557782275938"
+      },
+      "related-to": [
+        {
+          "id": "8208",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "license",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABCD1234/licenses/license/license-test-1-ABCD1234/license-test-2-ABCD1234"
+        },
+        {
+          "id": "8400",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "entitlement",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABCD1234/entitlements/entitlement/entitlement-test-21-ABCD1234/entitlement-test-22-ABCD1234"
+        },
+        {
+          "id": "4344",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABCD1234"
+        }
+      ]
+    },
+    {
+      "id": "12480",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-50-ABC321",
+      "properties": {
+        "vnf-id": "generic-vnf-test-50-ABC321",
+        "vnf-name": "example-vnf-name-val-3979-2",
+        "vnf-type": "example-vnf-type-val-3979-2",
+        "prov-status": "ACTIVE",
+        "orchestration-status": "orchestration-status-2",
+        "ipv4-loopback0-address": "ipv4-loopback0-address-2",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1557862849169"
+      },
+      "related-to": [
+        {
+          "id": "12504",
+          "relationship-label": "org.onap.relationships.inventory.ComposedOf",
+          "node-type": "service-instance",
+          "url": "/aai/v15/business/customers/customer/customer-test-2-ABC321/service-subscriptions/service-subscription/service-subscription-test-2-ABC321/service-instances/service-instance/service-instance-test-2-ABC321"
+        },
+        {
+          "id": "8440",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "vnfc",
+          "url": "/aai/v15/network/vnfcs/vnfc/vnfc-test-2-ABC321"
+        },
+        {
+          "id": "16592",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "vnfc",
+          "url": "/aai/v15/network/vnfcs/vnfc/vnfc-test-1-ABC321"
+        },
+        {
+          "id": "16520",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC321/cr-test-4-ABC321/tenants/tenant/tenant-test-2-ABC321/vservers/vserver/vserver-test-2-ABC321"
+        }
+      ]
+    },
+    {
+      "id": "4288",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-DEF321",
+      "properties": {
+        "vnf-id": "generic-vnf-test-0-DEF321",
+        "vnf-name": "example-vnf-name-val-3979",
+        "vnf-type": "example-vnf-type-val-3979",
+        "prov-status": "PROV",
+        "orchestration-status": "ALL-GOOD-orchestration-status",
+        "ipv4-loopback0-address": "ipv4-loopback0-address-ALL-GOOD-one",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1557779846272"
+      },
+      "related-to": [
+        {
+          "id": "4112",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "license",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-DEF321/licenses/license/license-test-1-DEF321/license-test-2-DEF321"
+        },
+        {
+          "id": "4248",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "entitlement",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-DEF321/entitlements/entitlement/entitlement-test-21-DEF321/entitlement-test-22-DEF321"
+        },
+        {
+          "id": "4312",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-DEF321"
+        }
+      ]
+    },
+    {
+      "id": "24776",
+      "node-type": "cloud-region",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/onap-demo-aic/cr-demo",
+      "properties": {
+        "cloud-owner": "onap-demo-aic",
+        "cloud-region-id": "cr-demo",
+        "cloud-type": "open-stack-1",
+        "owner-defined-type": "example-owner-defined-type-val-94072",
+        "cloud-region-version": "cloud-region-version-val-1",
+        "identity-url": "example-identity-url-val-74657",
+        "cloud-zone": "example-cloud-zone-val-17598",
+        "complex-name": "example-complex-name-val-55430",
+        "sriov-automation": "true",
+        "resource-version": "1559204203167"
+      },
+      "related-to": [
+        {
+          "id": "41152",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "tenant",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/onap-demo-aic/cr-demo/tenants/tenant/tenant-demo-1"
+        }
+      ]
+    },
+    {
+      "id": "41152",
+      "node-type": "tenant",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/onap-demo-aic/cr-demo/tenants/tenant/tenant-demo-1",
+      "properties": {
+        "tenant-id": "tenant-demo-1",
+        "tenant-name": "tenant-demo",
+        "tenant-context": "value-3",
+        "resource-version": "1559204265043"
+      },
+      "related-to": [
+        {
+          "id": "32792",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/onap-demo-aic/cr-demo/tenants/tenant/tenant-demo-1/vservers/vserver/vserver-demo"
+        },
+        {
+          "id": "24776",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "cloud-region",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/onap-demo-aic/cr-demo"
+        }
+      ]
+    },
+    {
+      "id": "36880",
+      "node-type": "complex",
+      "url": "/aai/v15/cloud-infrastructure/complexes/complex/complex-test-2-ABC898",
+      "properties": {
+        "physical-location-id": "complex-test-2-ABC898",
+        "data-center-code": "test-cityil-test-22",
+        "complex-name": "complex-name-test-cityil-test-22",
+        "resource-version": "1558032218687",
+        "physical-location-type": "test-city-lab",
+        "street1": "test-street",
+        "street2": "test-street",
+        "city": "test-city",
+        "state": "test-state",
+        "postal-code": "12345",
+        "country": "test-country",
+        "region": "test-region",
+        "latitude": "example-latitude-val-2652",
+        "longitude": "example-longitude-val-2652",
+        "elevation": "95",
+        "lata": "example-lata-val-2652"
+      },
+      "related-to": [
+        {
+          "id": "20680",
+          "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-2-ABC898"
+        }
+      ]
+    },
+    {
+      "id": "24728",
+      "node-type": "vnf-image",
+      "url": "/aai/v15/service-design-and-creation/vnf-images/vnf-image/image123-testABC123",
+      "properties": {
+        "vnf-image-uuid": "image123-testABC123",
+        "application": "YRopOEvVAfskc",
+        "application-vendor": "5gQvBBKzxfjA",
+        "application-version": "oPW9s4d2K",
+        "selflink": "ME24b",
+        "resource-version": "1558026210135"
+      },
+      "related-to": [
+        {
+          "id": "16600",
+          "relationship-label": "org.onap.relationships.inventory.Uses",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123"
+        }
+      ]
+    },
+    {
+      "id": "32960",
+      "node-type": "vnfc",
+      "url": "/aai/v15/network/vnfcs/vnfc/vnfc-test-1-ABC898",
+      "properties": {
+        "vnfc-name": "vnfc-test-1-ABC898",
+        "nfc-naming-code": "example-vnfc-function-code-val-69324",
+        "nfc-function": "example-vnfc-type-val-25880",
+        "in-maint": true,
+        "is-closed-loop-disabled": true,
+        "resource-version": "1558032266312"
+      },
+      "related-to": [
+        {
+          "id": "37056",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-50-ABC898"
+        }
+      ]
+    },
+    {
+      "id": "8384",
+      "node-type": "l-interface",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC321/cr-test-4-ABC321/tenants/tenant/tenant-test-2-ABC321/vservers/vserver/vserver-test-2-ABC321/l-interfaces/l-interface/l-interface-test-2-ABC321",
+      "properties": {
+        "interface-name": "l-interface-test-2-ABC321",
+        "interface-role": "example-interface-role-val-8875",
+        "is-port-mirrored": false,
+        "resource-version": "1557862817841",
+        "in-maint": false,
+        "is-ip-unnumbered": false
+      },
+      "related-to": [
+        {
+          "id": "16520",
+          "relationship-label": "tosca.relationships.network.BindsTo",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC321/cr-test-4-ABC321/tenants/tenant/tenant-test-2-ABC321/vservers/vserver/vserver-test-2-ABC321"
+        }
+      ]
+    },
+    {
+      "id": "12496",
+      "node-type": "pserver",
+      "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-2-ABC321",
+      "properties": {
+        "hostname": "pserver-test-2-ABC321",
+        "in-maint": false,
+        "resource-version": "1557862801991"
+      },
+      "related-to": [
+        {
+          "id": "16520",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC321/cr-test-4-ABC321/tenants/tenant/tenant-test-2-ABC321/vservers/vserver/vserver-test-2-ABC321"
+        },
+        {
+          "id": "12312",
+          "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+          "node-type": "complex",
+          "url": "/aai/v15/cloud-infrastructure/complexes/complex/complex-test-2-ABC321"
+        }
+      ]
+    },
+    {
+      "id": "32792",
+      "node-type": "vserver",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/onap-demo-aic/cr-demo/tenants/tenant/tenant-demo-1/vservers/vserver/vserver-demo",
+      "properties": {
+        "vserver-id": "vserver-demo",
+        "vserver-name": "nj-vserver-demo",
+        "vserver-name2": "test-demo-vserver",
+        "prov-status": "in-maint",
+        "vserver-selflink": "https://test.com:8774/v2/332775c7707b44b7bc990884f97a2366/servers/959798c2-f024-4db5-af72-9860775ab80e-example",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1559204365308"
+      },
+      "related-to": [
+        {
+          "id": "41152",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "tenant",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/onap-demo-aic/cr-demo/tenants/tenant/tenant-demo-1"
+        },
+        {
+          "id": "53264",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-demo-1"
+        }
+      ]
+    },
+    {
+      "id": "45208",
+      "node-type": "complex",
+      "url": "/aai/v15/cloud-infrastructure/complexes/complex/complex-demo-1",
+      "properties": {
+        "physical-location-id": "complex-demo-1",
+        "data-center-code": "test-complex-11",
+        "complex-name": "complex-name-demo-11",
+        "resource-version": "1559205174569",
+        "physical-location-type": "demo-lab",
+        "street1": "test",
+        "street2": "test",
+        "city": "test",
+        "state": "test",
+        "postal-code": "12345",
+        "country": "test",
+        "region": "test",
+        "latitude": "example-latitude-val-2652",
+        "longitude": "example-longitude-val-2652",
+        "elevation": "95",
+        "lata": "example-lata-val-2652"
+      },
+      "related-to": [
+        {
+          "id": "53264",
+          "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-demo-1"
+        }
+      ]
+    },
+    {
+      "id": "8288",
+      "node-type": "cloud-region",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC898/cr-test-4-ABC898",
+      "properties": {
+        "cloud-owner": "cr-test-3-ABC898",
+        "cloud-region-id": "cr-test-4-ABC898",
+        "cloud-type": "example-cloud-type-val-93696",
+        "owner-defined-type": "example-owner-defined-type-val-16874",
+        "cloud-region-version": "example-cloud-region-version-val-20485",
+        "identity-url": "example-identity-url-val-31885",
+        "cloud-zone": "example-cloud-zone-val-42889",
+        "complex-name": "example-complex-name-val-13802",
+        "resource-version": "1558032233980"
+      },
+      "related-to": [
+        {
+          "id": "40976",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "tenant",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC898/cr-test-4-ABC898/tenants/tenant/tenant-test-2-ABC898"
+        }
+      ]
+    },
+    {
+      "id": "4192",
+      "node-type": "tenant",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/onap-new-aic/newRegId1/tenants/tenant/tenant-newTest-8641-example",
+      "properties": {
+        "tenant-id": "tenant-newTest-8641-example",
+        "tenant-name": "tenant-name-8641-example",
+        "tenant-context": "value-3",
+        "resource-version": "1557865553523"
+      },
+      "related-to": [
+        {
+          "id": "20496",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/onap-new-aic/newRegId1/tenants/tenant/tenant-newTest-8641-example/vservers/vserver/959798c2-f024-4db5-af72-9860775ab80e-example"
+        },
+        {
+          "id": "16400",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "cloud-region",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/onap-new-aic/newRegId1"
+        }
+      ]
+    },
+    {
+      "id": "8328",
+      "node-type": "cloud-region",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC321/cr-test-4-ABC321",
+      "properties": {
+        "cloud-owner": "cr-test-3-ABC321",
+        "cloud-region-id": "cr-test-4-ABC321",
+        "cloud-type": "example-cloud-type-val-93696",
+        "owner-defined-type": "example-owner-defined-type-val-16874",
+        "cloud-region-version": "example-cloud-region-version-val-20485",
+        "identity-url": "example-identity-url-val-31885",
+        "cloud-zone": "example-cloud-zone-val-42889",
+        "complex-name": "example-complex-name-val-13802",
+        "resource-version": "1557862817350"
+      },
+      "related-to": [
+        {
+          "id": "12424",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "tenant",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC321/cr-test-4-ABC321/tenants/tenant/tenant-test-2-ABC321"
+        }
+      ]
+    },
+    {
+      "id": "4120",
+      "node-type": "complex",
+      "url": "/aai/v15/cloud-infrastructure/complexes/complex/complex-test-1-DEF321",
+      "properties": {
+        "physical-location-id": "complex-test-1-DEF321",
+        "data-center-code": "test-11",
+        "complex-name": "complex-name-test-11",
+        "resource-version": "1557779753467",
+        "physical-location-type": "test-city-lab",
+        "street1": "test",
+        "street2": "test",
+        "city": "test",
+        "state": "test",
+        "postal-code": "12345",
+        "country": "test",
+        "region": "test",
+        "latitude": "example-latitude-val-2652",
+        "longitude": "example-longitude-val-2652",
+        "elevation": "95",
+        "lata": "example-lata-val-2652"
+      },
+      "related-to": [
+        {
+          "id": "4312",
+          "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-DEF321"
+        }
+      ]
+    },
+    {
+      "id": "20688",
+      "node-type": "vlan",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/l-interfaces/l-interface/linterface-keyABC123/vlans/vlan/vlan-interface01ABC123",
+      "properties": {
+        "vlan-interface": "vlan-interface01ABC123",
+        "vlan-id-inner": 527,
+        "vlan-id-outer": 279,
+        "resource-version": "1558026227364",
+        "speed-value": "3w2",
+        "speed-units": "BYX",
+        "vlan-description": "pzJj",
+        "backdoor-connection": "4KE",
+        "vpn-key": "jX71Yns",
+        "orchestration-status": "eg4tbeur7",
+        "in-maint": false,
+        "prov-status": "vtxiZgfOCb",
+        "is-ip-unnumbered": false,
+        "is-private": false
+      },
+      "related-to": [
+        {
+          "id": "20616",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "l3-interface-ipv6-address-list",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/l-interfaces/l-interface/linterface-keyABC123/vlans/vlan/vlan-interface01ABC123/l3-interface-ipv6-address-list/vlan-ipv6-address01ABC123"
+        },
+        {
+          "id": "24768",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "l3-interface-ipv4-address-list",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/l-interfaces/l-interface/linterface-keyABC123/vlans/vlan/vlan-interface01ABC123/l3-interface-ipv4-address-list/vlan-ipv6-address01ABC123"
+        },
+        {
+          "id": "16576",
+          "relationship-label": "tosca.relationships.network.LinksTo",
+          "node-type": "l-interface",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/l-interfaces/l-interface/linterface-keyABC123"
+        }
+      ]
+    },
+    {
+      "id": "8440",
+      "node-type": "vnfc",
+      "url": "/aai/v15/network/vnfcs/vnfc/vnfc-test-2-ABC321",
+      "properties": {
+        "vnfc-name": "vnfc-test-2-ABC321",
+        "nfc-naming-code": "example-vnfc-function-code-val-69324-2",
+        "nfc-function": "example-vnfc-type-val-25880-2",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1557862848997"
+      },
+      "related-to": [
+        {
+          "id": "12480",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-50-ABC321"
+        }
+      ]
+    },
+    {
+      "id": "8208",
+      "node-type": "license",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABCD1234/licenses/license/license-test-1-ABCD1234/license-test-2-ABCD1234",
+      "properties": {
+        "group-uuid": "license-test-1-ABCD1234",
+        "resource-uuid": "license-test-2-ABCD1234",
+        "resource-version": "1557782306756"
+      },
+      "related-to": [
+        {
+          "id": "12488",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABCD1234"
+        }
+      ]
+    },
+    {
+      "id": "16584",
+      "node-type": "vserver",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890",
+      "properties": {
+        "vserver-id": "vserver-test-3-ABC890",
+        "vserver-name": "example-vserver-name-val-30739",
+        "vserver-name2": "example-vserver-name2-val-67128",
+        "prov-status": "PROV",
+        "vserver-selflink": "example-vserver-selflink-val-66843",
+        "in-maint": true,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1558031746466"
+      },
+      "related-to": [
+        {
+          "id": "16632",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890"
+        },
+        {
+          "id": "20728",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "tenant",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890"
+        },
+        {
+          "id": "28864",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "28864",
+      "node-type": "pserver",
+      "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890",
+      "properties": {
+        "hostname": "pserver-test-1-ABC890",
+        "in-maint": false,
+        "resource-version": "1558031744715"
+      },
+      "related-to": [
+        {
+          "id": "16584",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890"
+        },
+        {
+          "id": "16632",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890"
+        },
+        {
+          "id": "24600",
+          "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+          "node-type": "complex",
+          "url": "/aai/v15/cloud-infrastructure/complexes/complex/complex-test-1-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "24784",
+      "node-type": "service-instance",
+      "url": "/aai/v15/business/customers/customer/customer-test-2-ABC898/service-subscriptions/service-subscription/service-subscription-test-2-ABC898/service-instances/service-instance/service-instance-test-2-ABC898",
+      "properties": {
+        "service-instance-id": "service-instance-test-2-ABC898",
+        "resource-version": "1558032267163"
+      },
+      "related-to": [
+        {
+          "id": "37056",
+          "relationship-label": "org.onap.relationships.inventory.ComposedOf",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-50-ABC898"
+        },
+        {
+          "id": "49168",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "service-subscription",
+          "url": "/aai/v15/business/customers/customer/customer-test-2-ABC898/service-subscriptions/service-subscription/service-subscription-test-2-ABC898"
+        }
+      ]
+    },
+    {
+      "id": "28872",
+      "node-type": "tenant",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/onap-demo-aic/cr-demo-1/tenants/tenant/tenant-demo-1",
+      "properties": {
+        "tenant-id": "tenant-demo-1",
+        "tenant-name": "tenant-demo",
+        "tenant-context": "value-3",
+        "resource-version": "1559204240213"
+      },
+      "related-to": [
+        {
+          "id": "32920",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "cloud-region",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/onap-demo-aic/cr-demo-1"
+        }
+      ]
+    },
+    {
+      "id": "24600",
+      "node-type": "complex",
+      "url": "/aai/v15/cloud-infrastructure/complexes/complex/complex-test-1-ABC890",
+      "properties": {
+        "physical-location-id": "complex-test-1-ABC890",
+        "data-center-code": "test-cityil-test-11",
+        "complex-name": "complex-name-test-cityil-test-11",
+        "resource-version": "1558031745028",
+        "physical-location-type": "test-city-lab",
+        "street1": "test",
+        "street2": "test",
+        "city": "test",
+        "state": "test",
+        "postal-code": "12345",
+        "country": "test",
+        "region": "test",
+        "latitude": "example-latitude-val-2652",
+        "longitude": "example-longitude-val-2652",
+        "elevation": "95",
+        "lata": "example-lata-val-2652"
+      },
+      "related-to": [
+        {
+          "id": "28864",
+          "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "16632",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+      "properties": {
+        "vnf-id": "generic-vnf-test-0-ABC890",
+        "vnf-name": "example-vnf-name-val-3979",
+        "vnf-type": "vnf-type-onap-sic",
+        "prov-status": "IN-MAINT",
+        "orchestration-status": "INACTIVE",
+        "ipv4-loopback0-address": "ipv4-loopback0-address-ALL-GOOD-one-2",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1564408017172"
+      },
+      "related-to": [
+        {
+          "id": "24712",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "entitlement",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/entitlements/entitlement/entitlement-test-21-ABC890/entitlement-test-22-ABC890"
+        },
+        {
+          "id": "28696",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "license",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/licenses/license/license-test-1-ABC890/license-test-2-ABC890"
+        },
+        {
+          "id": "16584",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890"
+        },
+        {
+          "id": "28864",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890"
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/app/assets/stubs/BYOQNoResults.json b/src/app/assets/stubs/BYOQNoResults.json
new file mode 100644
index 0000000..914332e
--- /dev/null
+++ b/src/app/assets/stubs/BYOQNoResults.json
@@ -0,0 +1,3 @@
+{
+  "results": []
+}
\ No newline at end of file
diff --git a/src/app/assets/stubs/BYOQPersonalQueries.json b/src/app/assets/stubs/BYOQPersonalQueries.json
new file mode 100644
index 0000000..fe51488
--- /dev/null
+++ b/src/app/assets/stubs/BYOQPersonalQueries.json
@@ -0,0 +1 @@
+[]
diff --git a/src/app/assets/stubs/BYOQPublicQueries.json b/src/app/assets/stubs/BYOQPublicQueries.json
new file mode 100644
index 0000000..fe51488
--- /dev/null
+++ b/src/app/assets/stubs/BYOQPublicQueries.json
@@ -0,0 +1 @@
+[]
diff --git a/src/app/assets/stubs/BYOQSaveInfo.json b/src/app/assets/stubs/BYOQSaveInfo.json
new file mode 100644
index 0000000..f301e64
--- /dev/null
+++ b/src/app/assets/stubs/BYOQSaveInfo.json
@@ -0,0 +1 @@
+{"status":"201"}
\ No newline at end of file
diff --git a/src/app/assets/stubs/CQDefault.json b/src/app/assets/stubs/CQDefault.json
new file mode 100644
index 0000000..451d3d0
--- /dev/null
+++ b/src/app/assets/stubs/CQDefault.json
@@ -0,0 +1,107 @@
+{
+  "results": [
+    {
+      "id": "16632",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+      "properties": {
+        "vnf-id": "generic-vnf-test-0-ABC890",
+        "vnf-name": "example-vnf-name-val-3979",
+        "vnf-type": "vnf-type-onap-sic",
+        "prov-status": "PROV",
+        "orchestration-status": "ACTIVE",
+        "ipv4-loopback0-address": "ipv4-loopback0-address-ALL-GOOD-one",
+        "in-maint": true,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1559248669411"
+      },
+      "related-to": [
+        {
+          "id": "24712",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "entitlement",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/entitlements/entitlement/entitlement-test-21-ABC890/entitlement-test-22-ABC890"
+        },
+        {
+          "id": "28696",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "license",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/licenses/license/license-test-1-ABC890/license-test-2-ABC890"
+        },
+        {
+          "id": "16584",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890"
+        },
+        {
+          "id": "28864",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "28864",
+      "node-type": "pserver",
+      "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890",
+      "properties": {
+        "hostname": "pserver-test-1-ABC890",
+        "in-maint": false,
+        "resource-version": "1558031744715"
+      },
+      "related-to": [
+        {
+          "id": "16584",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890"
+        },
+        {
+          "id": "16632",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890"
+        },
+        {
+          "id": "24600",
+          "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+          "node-type": "complex",
+          "url": "/aai/v15/cloud-infrastructure/complexes/complex/complex-test-1-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "24600",
+      "node-type": "complex",
+      "url": "/aai/v15/cloud-infrastructure/complexes/complex/complex-test-1-ABC890",
+      "properties": {
+        "physical-location-id": "complex-test-1-ABC890",
+        "data-center-code": "lisleil-test-11",
+        "complex-name": "complex-name-lisleil-test-11",
+        "resource-version": "1558031745028",
+        "physical-location-type": "lisle-lab",
+        "street1": "4513 Western Ave",
+        "street2": "CU-211",
+        "city": "Lisle",
+        "state": "IL",
+        "postal-code": "60532",
+        "country": "USA",
+        "region": "Midwest",
+        "latitude": "example-latitude-val-2652",
+        "longitude": "example-longitude-val-2652",
+        "elevation": "95",
+        "lata": "example-lata-val-2652"
+      },
+      "related-to": [
+        {
+          "id": "28864",
+          "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890"
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/app/assets/stubs/ConvertQueryToTree.json b/src/app/assets/stubs/ConvertQueryToTree.json
new file mode 100644
index 0000000..4a3a31e
--- /dev/null
+++ b/src/app/assets/stubs/ConvertQueryToTree.json
@@ -0,0 +1,142 @@
+{
+  "node-filter": [],
+  "children": [
+    {
+      "node-filter": [
+        [
+          {
+            "filter": "EQ",
+            "value": [
+              "test-physical-location-id"
+            ],
+            "key": "physical-location-id"
+          }
+        ],
+        [
+          {
+            "filter": "EQ",
+            "value": [
+              "test-physical-location-type"
+            ],
+            "key": "physical-location-type"
+          }
+        ],
+        [
+          {
+            "filter": "EQ",
+            "value": [
+              "test-street1"
+            ],
+            "key": "street1"
+          }
+        ],
+        [
+          {
+            "filter": "EQ",
+            "value": [
+              "test-city"
+            ],
+            "key": "city"
+          }
+        ],
+        [
+          {
+            "filter": "EQ",
+            "value": [
+              "12345"
+            ],
+            "key": "postal-code"
+          }
+        ],
+        [
+          {
+            "filter": "EQ",
+            "value": [
+              "Test-Country"
+            ],
+            "key": "country"
+          }
+        ],
+        [
+          {
+            "filter": "EQ",
+            "value": [
+              "Test-Region"
+            ],
+            "key": "region"
+          }
+        ]
+      ],
+      "children": [
+        {
+          "node-filter": [],
+          "children": [],
+          "node-type": "cloud-region",
+          "where-filter": [],
+          "not-where": false,
+          "id": "A2",
+          "store": true,
+          "parent-type": "complex",
+          "labels": []
+        },
+        {
+          "node-filter": [],
+          "children": [],
+          "node-type": "pnf",
+          "where-filter": [],
+          "not-where": false,
+          "id": "A3",
+          "store": true,
+          "parent-type": "complex",
+          "labels": []
+        },
+        {
+          "node-filter": [],
+          "children": [],
+          "node-type": "pserver",
+          "where-filter": [],
+          "not-where": false,
+          "id": "A4",
+          "store": true,
+          "parent-type": "complex",
+          "labels": []
+        },
+        {
+          "node-filter": [],
+          "children": [],
+          "node-type": "rack",
+          "where-filter": [],
+          "not-where": false,
+          "id": "A5",
+          "store": true,
+          "parent-type": "complex",
+          "labels": []
+        },
+        {
+          "node-filter": [],
+          "children": [],
+          "node-type": "zone",
+          "where-filter": [],
+          "not-where": false,
+          "id": "A6",
+          "store": true,
+          "parent-type": "complex",
+          "labels": []
+        }
+      ],
+      "node-type": "complex",
+      "where-filter": [],
+      "not-where": false,
+      "id": "A1",
+      "store": true,
+      "parent-type": "",
+      "labels": []
+    }
+  ],
+  "node-type": "",
+  "where-filter": [],
+  "not-where": false,
+  "id": "A0",
+  "store": false,
+  "parent-type": ""
+}
diff --git a/src/app/assets/stubs/SingleTransactionEdit.json b/src/app/assets/stubs/SingleTransactionEdit.json
new file mode 100644
index 0000000..4322aee
--- /dev/null
+++ b/src/app/assets/stubs/SingleTransactionEdit.json
@@ -0,0 +1,10 @@
+{
+  "operation-responses": [
+    {
+      "action": "patch",
+      "uri": "network/pnfs/pnf/test1/lag-interfaces/lag-interface/test1",
+      "response-status-code": 200,
+      "response-body": null
+    }
+  }
+}
diff --git a/src/app/assets/stubs/currentBYOQState.json b/src/app/assets/stubs/currentBYOQState.json
new file mode 100644
index 0000000..4e120e4
--- /dev/null
+++ b/src/app/assets/stubs/currentBYOQState.json
@@ -0,0 +1,391 @@
+{
+  "results": [
+    {
+      "id": "4256",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+      "properties": [
+        {
+          "key": "aai-node-type",
+          "value": "generic-vnf",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "source-of-truth",
+          "value": "F-Test-ABC890",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "aai-uri",
+          "value": "/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "vnf-id",
+          "value": "generic-vnf-test-0-ABC890",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "vnf-name",
+          "value": "example-vnf-name-val-3979",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "is-closed-loop-disabled",
+          "value": false,
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "start-ts",
+          "value": 1558031743832,
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "ipv4-loopback0-address",
+          "value": "ipv4-loopback0-address-ALL-GOOD-one",
+          "timestamp": 1558031839071,
+          "sot": "M-ABC890"
+        },
+        {
+          "key": "vnf-type",
+          "value": "vnf-type-onap-sic",
+          "timestamp": 1559237141294,
+          "sot": "SO"
+        },
+        {
+          "key": "orchestration-status",
+          "value": "ACTIVE",
+          "timestamp": 1559248669446,
+          "sot": "SOURCETEST"
+        },
+        {
+          "key": "in-maint",
+          "value": true,
+          "timestamp": 1559248669446,
+          "sot": "SOURCETEST"
+        },
+        {
+          "key": "prov-status",
+          "value": "PROV",
+          "timestamp": 1559248669446,
+          "sot": "SOURCETEST"
+        }
+      ],
+      "related-to": [
+        {
+          "id": "8312",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "license",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/licenses/license/license-test-1-ABC890/license-test-2-ABC890",
+          "timestamp": 1558031870276,
+          "sot": "N-ABC890"
+        },
+        {
+          "id": "12344",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "entitlement",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/entitlements/entitlement/entitlement-test-21-ABC890/entitlement-test-22-ABC890",
+          "timestamp": 1558031901473,
+          "sot": "R-ABC890"
+        },
+        {
+          "id": "8248",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "id": "8400",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890",
+          "timestamp": 1558031746239,
+          "sot": "F-Test-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "8312",
+      "node-type": "license",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/licenses/license/license-test-1-ABC890/license-test-2-ABC890",
+      "properties": [
+        {
+          "key": "aai-node-type",
+          "value": "license",
+          "timestamp": 1558031870276,
+          "sot": "N-ABC890"
+        },
+        {
+          "key": "source-of-truth",
+          "value": "N-ABC890",
+          "timestamp": 1558031870276,
+          "sot": "N-ABC890"
+        },
+        {
+          "key": "aai-uri",
+          "value": "/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/licenses/license/license-test-1-ABC890/license-test-2-ABC890",
+          "timestamp": 1558031870276,
+          "sot": "N-ABC890"
+        },
+        {
+          "key": "group-uuid",
+          "value": "license-test-1-ABC890",
+          "timestamp": 1558031870276,
+          "sot": "N-ABC890"
+        },
+        {
+          "key": "resource-uuid",
+          "value": "license-test-2-ABC890",
+          "timestamp": 1558031870276,
+          "sot": "N-ABC890"
+        },
+        {
+          "key": "start-ts",
+          "value": 1558031870276,
+          "timestamp": 1558031870276,
+          "sot": "N-ABC890"
+        }
+      ],
+      "related-to": [
+        {
+          "id": "4256",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+          "timestamp": 1558031870276,
+          "sot": "N-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "12344",
+      "node-type": "entitlement",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/entitlements/entitlement/entitlement-test-21-ABC890/entitlement-test-22-ABC890",
+      "properties": [
+        {
+          "key": "aai-node-type",
+          "value": "entitlement",
+          "timestamp": 1558031901473,
+          "sot": "R-ABC890"
+        },
+        {
+          "key": "source-of-truth",
+          "value": "R-ABC890",
+          "timestamp": 1558031901473,
+          "sot": "R-ABC890"
+        },
+        {
+          "key": "aai-uri",
+          "value": "/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/entitlements/entitlement/entitlement-test-21-ABC890/entitlement-test-22-ABC890",
+          "timestamp": 1558031901473,
+          "sot": "R-ABC890"
+        },
+        {
+          "key": "group-uuid",
+          "value": "entitlement-test-21-ABC890",
+          "timestamp": 1558031901473,
+          "sot": "R-ABC890"
+        },
+        {
+          "key": "resource-uuid",
+          "value": "entitlement-test-22-ABC890",
+          "timestamp": 1558031901473,
+          "sot": "R-ABC890"
+        },
+        {
+          "key": "start-ts",
+          "value": 1558031901473,
+          "timestamp": 1558031901473,
+          "sot": "R-ABC890"
+        }
+      ],
+      "related-to": [
+        {
+          "id": "4256",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+          "timestamp": 1558031901473,
+          "sot": "R-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "8248",
+      "node-type": "pserver",
+      "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890",
+      "properties": [
+        {
+          "key": "in-maint",
+          "value": false,
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "aai-node-type",
+          "value": "pserver",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "source-of-truth",
+          "value": "F-Test-ABC890",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "aai-uri",
+          "value": "/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "hostname",
+          "value": "pserver-test-1-ABC890",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "start-ts",
+          "value": 1558031744746,
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        }
+      ],
+      "related-to": [
+        {
+          "id": "4256",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "id": "8400",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890",
+          "timestamp": 1558031746491,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "id": "4216",
+          "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+          "node-type": "complex",
+          "url": "/aai/v15/cloud-infrastructure/complexes/complex/complex-test-1-ABC890",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "8400",
+      "node-type": "vserver",
+      "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890",
+      "properties": [
+        {
+          "key": "in-maint",
+          "value": true,
+          "timestamp": 1558031745958,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "prov-status",
+          "value": "PROV",
+          "timestamp": 1558031745958,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "aai-node-type",
+          "value": "vserver",
+          "timestamp": 1558031745958,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "source-of-truth",
+          "value": "F-Test-ABC890",
+          "timestamp": 1558031745958,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "aai-uri",
+          "value": "/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890",
+          "timestamp": 1558031745958,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "is-closed-loop-disabled",
+          "value": false,
+          "timestamp": 1558031745958,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "vserver-id",
+          "value": "vserver-test-3-ABC890",
+          "timestamp": 1558031745958,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "vserver-name",
+          "value": "example-vserver-name-val-30739",
+          "timestamp": 1558031745958,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "vserver-name2",
+          "value": "example-vserver-name2-val-67128",
+          "timestamp": 1558031745958,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "vserver-selflink",
+          "value": "example-vserver-selflink-val-66843",
+          "timestamp": 1558031745958,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "start-ts",
+          "value": 1558031745958,
+          "timestamp": 1558031745958,
+          "sot": "F-Test-ABC890"
+        }
+      ],
+      "related-to": [
+        {
+          "id": "4256",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+          "timestamp": 1558031746239,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "id": "4144",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "tenant",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890",
+          "timestamp": 1558031745958,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "id": "8248",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890",
+          "timestamp": 1558031746491,
+          "sot": "F-Test-ABC890"
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/app/assets/stubs/currentCQState.json b/src/app/assets/stubs/currentCQState.json
new file mode 100644
index 0000000..da2d473
--- /dev/null
+++ b/src/app/assets/stubs/currentCQState.json
@@ -0,0 +1,317 @@
+{
+  "results": [
+    {
+      "id": "4256",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+      "properties": [
+        {
+          "key": "aai-node-type",
+          "value": "generic-vnf",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "source-of-truth",
+          "value": "F-Test-ABC890",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "aai-uri",
+          "value": "/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "vnf-id",
+          "value": "generic-vnf-test-0-ABC890",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "vnf-name",
+          "value": "example-vnf-name-val-3979",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "is-closed-loop-disabled",
+          "value": false,
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "start-ts",
+          "value": 1558031743832,
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "ipv4-loopback0-address",
+          "value": "ipv4-loopback0-address-ALL-GOOD-one",
+          "timestamp": 1558031839071,
+          "sot": "M-ABC890"
+        },
+        {
+          "key": "vnf-type",
+          "value": "vnf-type-onap-sic",
+          "timestamp": 1559237141294,
+          "sot": "SO"
+        },
+        {
+          "key": "orchestration-status",
+          "value": "ACTIVE",
+          "timestamp": 1559248669446,
+          "sot": "SOURCETEST"
+        },
+        {
+          "key": "in-maint",
+          "value": true,
+          "timestamp": 1559248669446,
+          "sot": "SOURCETEST"
+        },
+        {
+          "key": "prov-status",
+          "value": "PROV",
+          "timestamp": 1559248669446,
+          "sot": "SOURCETEST"
+        }
+      ],
+      "related-to": [
+        {
+          "id": "8312",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "license",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/licenses/license/license-test-1-ABC890/license-test-2-ABC890",
+          "timestamp": 1558031870276,
+          "sot": "N-ABC890"
+        },
+        {
+          "id": "12344",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "entitlement",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/entitlements/entitlement/entitlement-test-21-ABC890/entitlement-test-22-ABC890",
+          "timestamp": 1558031901473,
+          "sot": "R-ABC890"
+        },
+        {
+          "id": "8248",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "id": "8400",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890",
+          "timestamp": 1558031746239,
+          "sot": "F-Test-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "8248",
+      "node-type": "pserver",
+      "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890",
+      "properties": [
+        {
+          "key": "in-maint",
+          "value": false,
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "aai-node-type",
+          "value": "pserver",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "source-of-truth",
+          "value": "F-Test-ABC890",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "aai-uri",
+          "value": "/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "hostname",
+          "value": "pserver-test-1-ABC890",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "start-ts",
+          "value": 1558031744746,
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        }
+      ],
+      "related-to": [
+        {
+          "id": "4256",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "id": "8400",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890",
+          "timestamp": 1558031746491,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "id": "4216",
+          "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+          "node-type": "complex",
+          "url": "/aai/v15/cloud-infrastructure/complexes/complex/complex-test-1-ABC890",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "4216",
+      "node-type": "complex",
+      "url": "/aai/v15/cloud-infrastructure/complexes/complex/complex-test-1-ABC890",
+      "properties": [
+        {
+          "key": "aai-node-type",
+          "value": "complex",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "source-of-truth",
+          "value": "F-Test-ABC890",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "aai-uri",
+          "value": "/cloud-infrastructure/complexes/complex/complex-test-1-ABC890",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "start-ts",
+          "value": 1558031745048,
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "physical-location-id",
+          "value": "complex-test-1-ABC890",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "data-center-code",
+          "value": "lisleil-test-11",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "complex-name",
+          "value": "complex-name-lisleil-test-11",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "physical-location-type",
+          "value": "lisle-lab",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "street1",
+          "value": "4513 Western Ave",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "street2",
+          "value": "CU-211",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "city",
+          "value": "Lisle",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "state",
+          "value": "IL",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "postal-code",
+          "value": "60532",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "country",
+          "value": "USA",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "region",
+          "value": "Midwest",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "latitude",
+          "value": "example-latitude-val-2652",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "longitude",
+          "value": "example-longitude-val-2652",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "elevation",
+          "value": "95",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "lata",
+          "value": "example-lata-val-2652",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        }
+      ],
+      "related-to": [
+        {
+          "id": "8248",
+          "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/app/assets/stubs/currentNodeState.json b/src/app/assets/stubs/currentNodeState.json
new file mode 100644
index 0000000..0f6b92e
--- /dev/null
+++ b/src/app/assets/stubs/currentNodeState.json
@@ -0,0 +1,117 @@
+{
+  "results": [
+    {
+      "id": "4256",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+      "properties": [
+        {
+          "key": "aai-node-type",
+          "value": "generic-vnf",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "source-of-truth",
+          "value": "F-Test-ABC890",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "aai-uri",
+          "value": "/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "vnf-id",
+          "value": "generic-vnf-test-0-ABC890",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "vnf-name",
+          "value": "example-vnf-name-val-3979",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "is-closed-loop-disabled",
+          "value": false,
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "start-ts",
+          "value": 1558031743832,
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "ipv4-loopback0-address",
+          "value": "ipv4-loopback0-address-ALL-GOOD-one",
+          "timestamp": 1558031839071,
+          "sot": "M-ABC890"
+        },
+        {
+          "key": "vnf-type",
+          "value": "vnf-type-onap-sic",
+          "timestamp": 1559237141294,
+          "sot": "SO"
+        },
+        {
+          "key": "orchestration-status",
+          "value": "ACTIVE",
+          "timestamp": 1559248669446,
+          "sot": "SOURCETEST"
+        },
+        {
+          "key": "in-maint",
+          "value": true,
+          "timestamp": 1559248669446,
+          "sot": "SOURCETEST"
+        },
+        {
+          "key": "prov-status",
+          "value": "PROV",
+          "timestamp": 1559248669446,
+          "sot": "SOURCETEST"
+        }
+      ],
+      "related-to": [
+        {
+          "id": "8312",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "license",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/licenses/license/license-test-1-ABC890/license-test-2-ABC890",
+          "timestamp": 1558031870276,
+          "sot": "N-ABC890"
+        },
+        {
+          "id": "12344",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "entitlement",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/entitlements/entitlement/entitlement-test-21-ABC890/entitlement-test-22-ABC890",
+          "timestamp": 1558031901473,
+          "sot": "R-ABC890"
+        },
+        {
+          "id": "8248",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "id": "8400",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890",
+          "timestamp": 1558031746239,
+          "sot": "F-Test-ABC890"
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/app/assets/stubs/historicalBYOQChanges.json b/src/app/assets/stubs/historicalBYOQChanges.json
new file mode 100644
index 0000000..aa4ce1c
--- /dev/null
+++ b/src/app/assets/stubs/historicalBYOQChanges.json
@@ -0,0 +1,68 @@
+{
+  "results": [
+    {
+      "node-type": "generic-vnf",
+      "uri": "/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+      "changes": [
+        1558031743832,
+        1558031744142,
+        1558031744433,
+        1558031744746,
+        1558031746239,
+        1558031761866,
+        1558031854596,
+        1558031870276,
+        1558031885834,
+        1558031901473
+      ]
+    },
+    {
+      "node-type": "license",
+      "uri": "/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/licenses/license/license-test-1-ABC890/license-test-2-ABC890",
+      "changes": [
+        1558031744142,
+        1558031854596
+      ]
+    },
+    {
+      "node-type": "license",
+      "uri": "/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/licenses/license/license-test-1-ABC890/license-test-2-ABC890",
+      "changes": [
+        1558031870276
+      ]
+    },
+    {
+      "node-type": "entitlement",
+      "uri": "/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/entitlements/entitlement/entitlement-test-11-ABC890/entitlement-test-12-ABC890",
+      "changes": [
+        1558031744433,
+        1558031885834
+      ]
+    },
+    {
+      "node-type": "entitlement",
+      "uri": "/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/entitlements/entitlement/entitlement-test-21-ABC890/entitlement-test-22-ABC890",
+      "changes": [
+        1558031901473
+      ]
+    },
+    {
+      "node-type": "pserver",
+      "uri": "/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890",
+      "changes": [
+        1558031744746,
+        1558031745048,
+        1558031746491
+      ]
+    },
+    {
+      "node-type": "vserver",
+      "uri": "/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890",
+      "changes": [
+        1558031745958,
+        1558031746239,
+        1558031746491
+      ]
+    }
+  ]
+}
diff --git a/src/app/assets/stubs/historicalBYOQState.json b/src/app/assets/stubs/historicalBYOQState.json
new file mode 100644
index 0000000..c140e10
--- /dev/null
+++ b/src/app/assets/stubs/historicalBYOQState.json
@@ -0,0 +1,276 @@
+{
+  "results": [
+    {
+      "id": "4256",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+      "properties": [
+        {
+          "key": "orchestration-status",
+          "value": "good-orchestration-status",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "in-maint",
+          "value": false,
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "prov-status",
+          "value": "ACTIVE",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "aai-node-type",
+          "value": "generic-vnf",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "source-of-truth",
+          "value": "F-Test-ABC890",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "aai-uri",
+          "value": "/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "vnf-id",
+          "value": "generic-vnf-test-0-ABC890",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "vnf-name",
+          "value": "example-vnf-name-val-3979",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "vnf-type",
+          "value": "FW",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "ipv4-loopback0-address",
+          "value": "ipv4-loopback0-address-good-one",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "is-closed-loop-disabled",
+          "value": false,
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "start-ts",
+          "value": 1558031743832,
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        }
+      ],
+      "related-to": [
+        {
+          "id": "4152",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "license",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/licenses/license/license-test-1-ABC890/license-test-2-ABC890",
+          "timestamp": 1558031744142,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "id": "8352",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "entitlement",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/entitlements/entitlement/entitlement-test-11-ABC890/entitlement-test-12-ABC890",
+          "timestamp": 1558031744433,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "id": "8248",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "4152",
+      "node-type": "license",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/licenses/license/license-test-1-ABC890/license-test-2-ABC890",
+      "properties": [
+        {
+          "key": "aai-node-type",
+          "value": "license",
+          "timestamp": 1558031744142,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "source-of-truth",
+          "value": "F-Test-ABC890",
+          "timestamp": 1558031744142,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "aai-uri",
+          "value": "/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/licenses/license/license-test-1-ABC890/license-test-2-ABC890",
+          "timestamp": 1558031744142,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "group-uuid",
+          "value": "license-test-1-ABC890",
+          "timestamp": 1558031744142,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "resource-uuid",
+          "value": "license-test-2-ABC890",
+          "timestamp": 1558031744142,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "start-ts",
+          "value": 1558031744142,
+          "timestamp": 1558031744142,
+          "sot": "F-Test-ABC890"
+        }
+      ],
+      "related-to": [
+        {
+          "id": "4256",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+          "timestamp": 1558031744142,
+          "sot": "F-Test-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "8352",
+      "node-type": "entitlement",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/entitlements/entitlement/entitlement-test-11-ABC890/entitlement-test-12-ABC890",
+      "properties": [
+        {
+          "key": "aai-node-type",
+          "value": "entitlement",
+          "timestamp": 1558031744433,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "source-of-truth",
+          "value": "F-Test-ABC890",
+          "timestamp": 1558031744433,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "aai-uri",
+          "value": "/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/entitlements/entitlement/entitlement-test-11-ABC890/entitlement-test-12-ABC890",
+          "timestamp": 1558031744433,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "group-uuid",
+          "value": "entitlement-test-11-ABC890",
+          "timestamp": 1558031744433,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "resource-uuid",
+          "value": "entitlement-test-12-ABC890",
+          "timestamp": 1558031744433,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "start-ts",
+          "value": 1558031744433,
+          "timestamp": 1558031744433,
+          "sot": "F-Test-ABC890"
+        }
+      ],
+      "related-to": [
+        {
+          "id": "4256",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+          "timestamp": 1558031744433,
+          "sot": "F-Test-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "8248",
+      "node-type": "pserver",
+      "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890",
+      "properties": [
+        {
+          "key": "in-maint",
+          "value": false,
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "aai-node-type",
+          "value": "pserver",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "source-of-truth",
+          "value": "F-Test-ABC890",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "aai-uri",
+          "value": "/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "hostname",
+          "value": "pserver-test-1-ABC890",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "start-ts",
+          "value": 1558031744746,
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        }
+      ],
+      "related-to": [
+        {
+          "id": "4256",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "generic-vnf",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "id": "4216",
+          "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+          "node-type": "complex",
+          "url": "/aai/v15/cloud-infrastructure/complexes/complex/complex-test-1-ABC890",
+          "timestamp": 1558031745048,
+          "sot": "F-Test-ABC890"
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/app/assets/stubs/historicalCQChanges.json b/src/app/assets/stubs/historicalCQChanges.json
new file mode 100644
index 0000000..3d0daac
--- /dev/null
+++ b/src/app/assets/stubs/historicalCQChanges.json
@@ -0,0 +1,36 @@
+{
+  "results": [
+    {
+      "node-type": "generic-vnf",
+      "uri": "/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+      "changes": [
+        1558031743832,
+        1558031744142,
+        1558031744433,
+        1558031744746,
+        1558031746239,
+        1558031761866,
+        1558031854596,
+        1558031870276,
+        1558031885834,
+        1558031901473
+      ]
+    },
+    {
+      "node-type": "pserver",
+      "uri": "/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890",
+      "changes": [
+        1558031744746,
+        1558031745048,
+        1558031746491
+      ]
+    },
+    {
+      "node-type": "complex",
+      "uri": "/cloud-infrastructure/complexes/complex/complex-test-1-ABC890",
+      "changes": [
+        1558031745048
+      ]
+    }
+  ]
+}
diff --git a/src/app/assets/stubs/historicalCQState.json b/src/app/assets/stubs/historicalCQState.json
new file mode 100644
index 0000000..5d81dfe
--- /dev/null
+++ b/src/app/assets/stubs/historicalCQState.json
@@ -0,0 +1,84 @@
+{
+  "results": [
+    {
+      "id": "4256",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+      "properties": [
+        {
+          "key": "orchestration-status",
+          "value": "good-orchestration-status",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "in-maint",
+          "value": false,
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "prov-status",
+          "value": "ACTIVE",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "aai-node-type",
+          "value": "generic-vnf",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "source-of-truth",
+          "value": "F-Test-ABC890",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "aai-uri",
+          "value": "/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "vnf-id",
+          "value": "generic-vnf-test-0-ABC890",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "vnf-name",
+          "value": "example-vnf-name-val-3979",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "vnf-type",
+          "value": "FW",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "ipv4-loopback0-address",
+          "value": "ipv4-loopback0-address-good-one",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "is-closed-loop-disabled",
+          "value": false,
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "start-ts",
+          "value": 1558031743832,
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        }
+      ],
+      "related-to": []
+    }
+  ]
+}
diff --git a/src/app/assets/stubs/historicalNodeState.json b/src/app/assets/stubs/historicalNodeState.json
new file mode 100644
index 0000000..0f6b92e
--- /dev/null
+++ b/src/app/assets/stubs/historicalNodeState.json
@@ -0,0 +1,117 @@
+{
+  "results": [
+    {
+      "id": "4256",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+      "properties": [
+        {
+          "key": "aai-node-type",
+          "value": "generic-vnf",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "source-of-truth",
+          "value": "F-Test-ABC890",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "aai-uri",
+          "value": "/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "vnf-id",
+          "value": "generic-vnf-test-0-ABC890",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "vnf-name",
+          "value": "example-vnf-name-val-3979",
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "is-closed-loop-disabled",
+          "value": false,
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "start-ts",
+          "value": 1558031743832,
+          "timestamp": 1558031743832,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "key": "ipv4-loopback0-address",
+          "value": "ipv4-loopback0-address-ALL-GOOD-one",
+          "timestamp": 1558031839071,
+          "sot": "M-ABC890"
+        },
+        {
+          "key": "vnf-type",
+          "value": "vnf-type-onap-sic",
+          "timestamp": 1559237141294,
+          "sot": "SO"
+        },
+        {
+          "key": "orchestration-status",
+          "value": "ACTIVE",
+          "timestamp": 1559248669446,
+          "sot": "SOURCETEST"
+        },
+        {
+          "key": "in-maint",
+          "value": true,
+          "timestamp": 1559248669446,
+          "sot": "SOURCETEST"
+        },
+        {
+          "key": "prov-status",
+          "value": "PROV",
+          "timestamp": 1559248669446,
+          "sot": "SOURCETEST"
+        }
+      ],
+      "related-to": [
+        {
+          "id": "8312",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "license",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/licenses/license/license-test-1-ABC890/license-test-2-ABC890",
+          "timestamp": 1558031870276,
+          "sot": "N-ABC890"
+        },
+        {
+          "id": "12344",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "entitlement",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/entitlements/entitlement/entitlement-test-21-ABC890/entitlement-test-22-ABC890",
+          "timestamp": 1558031901473,
+          "sot": "R-ABC890"
+        },
+        {
+          "id": "8248",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890",
+          "timestamp": 1558031744746,
+          "sot": "F-Test-ABC890"
+        },
+        {
+          "id": "8400",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890",
+          "timestamp": 1558031746239,
+          "sot": "F-Test-ABC890"
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/app/assets/stubs/historicalNodeStateChanges.json b/src/app/assets/stubs/historicalNodeStateChanges.json
new file mode 100644
index 0000000..8df1d3f
--- /dev/null
+++ b/src/app/assets/stubs/historicalNodeStateChanges.json
@@ -0,0 +1,20 @@
+{
+  "results": [
+    {
+      "node-type": "generic-vnf",
+      "uri": "/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC123",
+      "changes": [
+        1558031743832,
+        1558031744142,
+        1558031744433,
+        1558031744746,
+        1558031746239,
+        1558031761866,
+        1558031854596,
+        1558031870276,
+        1558031885834,
+        1558031901473
+      ]
+    }
+  ]
+}
diff --git a/src/app/assets/stubs/modelDefault.json b/src/app/assets/stubs/modelDefault.json
new file mode 100644
index 0000000..1cce31f
--- /dev/null
+++ b/src/app/assets/stubs/modelDefault.json
@@ -0,0 +1,262 @@
+{
+  "results": [
+    {
+      "id": "16600",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123",
+      "properties": {
+        "vnf-id": "generic-vnfABC123",
+        "vnf-type": "example-vnf-type-val-3979-test",
+        "prov-status": "ACTIVE-NO",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1558031116089"
+      },
+      "related-to": [
+        {
+          "id": "20672",
+          "relationship-label": "org.onap.relationships.inventory.AppliesTo",
+          "node-type": "network-profile",
+          "url": "/aai/v15/cloud-infrastructure/network-profiles/network-profile/nm-profile234ABC123"
+        },
+        {
+          "id": "16576",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "l-interface",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/l-interfaces/l-interface/linterface-keyABC123"
+        },
+        {
+          "id": "28688",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "lag-interface",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnfABC123/lag-interfaces/lag-interface/lagintergace-test01ABC123"
+        },
+        {
+          "id": "24728",
+          "relationship-label": "org.onap.relationships.inventory.Uses",
+          "node-type": "vnf-image",
+          "url": "/aai/v15/service-design-and-creation/vnf-images/vnf-image/image123-testABC123"
+        }
+      ]
+    },
+    {
+      "id": "16632",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890",
+      "properties": {
+        "vnf-id": "generic-vnf-test-0-ABC890",
+        "vnf-name": "example-vnf-name-val-3979",
+        "vnf-type": "vnf-type-onap-sic",
+        "prov-status": "PROV",
+        "orchestration-status": "ACTIVE",
+        "ipv4-loopback0-address": "ipv4-loopback0-address-ALL-GOOD-one",
+        "in-maint": true,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1559248669411"
+      },
+      "related-to": [
+        {
+          "id": "24712",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "entitlement",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/entitlements/entitlement/entitlement-test-21-ABC890/entitlement-test-22-ABC890"
+        },
+        {
+          "id": "28696",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "license",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/licenses/license/license-test-1-ABC890/license-test-2-ABC890"
+        },
+        {
+          "id": "16584",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890"
+        },
+        {
+          "id": "28864",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890"
+        }
+      ]
+    },
+    {
+      "id": "37056",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-50-ABC898",
+      "properties": {
+        "vnf-id": "generic-vnf-test-50-ABC898",
+        "vnf-name": "example-vnf-name-val-3979-2",
+        "vnf-type": "example-vnf-type-val-3979-2",
+        "prov-status": "ACTIVE",
+        "orchestration-status": "orchestration-status-2",
+        "ipv4-loopback0-address": "ipv4-loopback0-address-2",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1558032266879"
+      },
+      "related-to": [
+        {
+          "id": "24784",
+          "relationship-label": "org.onap.relationships.inventory.ComposedOf",
+          "node-type": "service-instance",
+          "url": "/aai/v15/business/customers/customer/customer-test-2-ABC898/service-subscriptions/service-subscription/service-subscription-test-2-ABC898/service-instances/service-instance/service-instance-test-2-ABC898"
+        },
+        {
+          "id": "24824",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "vnfc",
+          "url": "/aai/v15/network/vnfcs/vnfc/vnfc-test-2-ABC898"
+        },
+        {
+          "id": "32960",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "vnfc",
+          "url": "/aai/v15/network/vnfcs/vnfc/vnfc-test-1-ABC898"
+        },
+        {
+          "id": "28808",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-ABC898/cr-test-4-ABC898/tenants/tenant/tenant-test-2-ABC898/vservers/vserver/vserver-test-2-ABC898"
+        }
+      ]
+    },
+    {
+      "id": "41112",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-demo1",
+      "properties": {
+        "vnf-id": "generic-vnf-demo1",
+        "vnf-type": "example-vnf-type-val-3979-generic-vnf-demo1",
+        "prov-status": "IN-MAINT",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1559204957136"
+      },
+      "related-to": [
+        {
+          "id": "53264",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-demo-1"
+        }
+      ]
+    },
+    {
+      "id": "4288",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-123ABC",
+      "properties": {
+        "vnf-id": "generic-vnf-test-0-123ABC",
+        "vnf-name": "example-vnf-name-val-3979",
+        "vnf-type": "example-vnf-type-val-3979",
+        "prov-status": "PROV",
+        "orchestration-status": "ALL-GOOD-orchestration-status",
+        "ipv4-loopback0-address": "ipv4-loopback0-address-ALL-GOOD-one",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1557779846272"
+      },
+      "related-to": [
+        {
+          "id": "4112",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "license",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-123ABC/licenses/license/license-test-1-123ABC/license-test-2-123ABC"
+        },
+        {
+          "id": "4248",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "entitlement",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-123ABC/entitlements/entitlement/entitlement-test-21-123ABC/entitlement-test-22-123ABC"
+        },
+        {
+          "id": "4312",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-123ABC"
+        }
+      ]
+    },
+    {
+      "id": "12480",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-50-123456",
+      "properties": {
+        "vnf-id": "generic-vnf-test-50-123456",
+        "vnf-name": "example-vnf-name-val-3979-2",
+        "vnf-type": "example-vnf-type-val-3979-2",
+        "prov-status": "ACTIVE",
+        "orchestration-status": "orchestration-status-2",
+        "ipv4-loopback0-address": "ipv4-loopback0-address-2",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1557862849169"
+      },
+      "related-to": [
+        {
+          "id": "12504",
+          "relationship-label": "org.onap.relationships.inventory.ComposedOf",
+          "node-type": "service-instance",
+          "url": "/aai/v15/business/customers/customer/customer-test-2-123456/service-subscriptions/service-subscription/service-subscription-test-2-123456/service-instances/service-instance/service-instance-test-2-123456"
+        },
+        {
+          "id": "8440",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "vnfc",
+          "url": "/aai/v15/network/vnfcs/vnfc/vnfc-test-2-123456"
+        },
+        {
+          "id": "16592",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "vnfc",
+          "url": "/aai/v15/network/vnfcs/vnfc/vnfc-test-1-123456"
+        },
+        {
+          "id": "16520",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-3-123456/cr-test-4-123456/tenants/tenant/tenant-test-2-123456/vservers/vserver/vserver-test-2-123456"
+        }
+      ]
+    },
+    {
+      "id": "12488",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABCD1234",
+      "properties": {
+        "vnf-id": "generic-vnf-test-0-ABCD1234",
+        "vnf-name": "example-vnf-name-val-3979",
+        "vnf-type": "example-vnf-type-val-3979",
+        "prov-status": "PROV",
+        "orchestration-status": "ALL-GOOD-orchestration-status",
+        "ipv4-loopback0-address": "ipv4-loopback0-address-ALL-GOOD-one",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1557782275938"
+      },
+      "related-to": [
+        {
+          "id": "8208",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "license",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABCD1234/licenses/license/license-test-1-ABCD1234/license-test-2-ABCD1234"
+        },
+        {
+          "id": "8400",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "entitlement",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABCD1234/entitlements/entitlement/entitlement-test-21-ABCD1234/entitlement-test-22-ABCD1234"
+        },
+        {
+          "id": "4344",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABCD1234"
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/app/assets/stubs/nodeLifeCycle.json b/src/app/assets/stubs/nodeLifeCycle.json
new file mode 100644
index 0000000..113dddc
--- /dev/null
+++ b/src/app/assets/stubs/nodeLifeCycle.json
@@ -0,0 +1,231 @@
+{
+  "results": [
+    {
+      "id": "4256",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test",
+      "properties": [
+        {
+          "key": "orchestration-status",
+          "value": "good-orchestration-status",
+          "timestamp": 1558031743832,
+          "end-timestamp": 1558031777175,
+          "sot": "F-Test-ABC890",
+          "end-sot": "SO-ABC890"
+        },
+        {
+          "key": "in-maint",
+          "value": false,
+          "timestamp": 1558031743832,
+          "end-timestamp": 1559237213226,
+          "sot": "F-Test-ABC890",
+          "end-sot": "SO"
+        },
+        {
+          "key": "prov-status",
+          "value": "ACTIVE",
+          "timestamp": 1558031743832,
+          "end-timestamp": 1558031761866,
+          "sot": "F-Test-ABC890",
+          "end-sot": "RO-ABC890"
+        },
+        {
+          "key": "vnf-type",
+          "value": "FW",
+          "timestamp": 1558031743832,
+          "end-timestamp": 1558031808199,
+          "sot": "F-Test-ABC890",
+          "end-sot": "H-ABC890"
+        },
+        {
+          "key": "ipv4-loopback0-address",
+          "value": "ipv4-loopback0-address-good-one",
+          "timestamp": 1558031743832,
+          "end-timestamp": 1558031808199,
+          "sot": "F-Test-ABC890",
+          "end-sot": "H-ABC890"
+        },
+        {
+          "key": "prov-status",
+          "value": "PROV",
+          "timestamp": 1558031761866,
+          "end-timestamp": 1559240185158,
+          "sot": "RO-ABC890",
+          "end-sot": "SO"
+        },
+        {
+          "key": "orchestration-status",
+          "value": "BAD-orchestration-status",
+          "timestamp": 1558031777175,
+          "end-timestamp": 1558031792461,
+          "sot": "SO-ABC890",
+          "end-sot": "P-ABC890"
+        },
+        {
+          "key": "orchestration-status",
+          "value": "ALL-GOOD-orchestration-status",
+          "timestamp": 1558031792461,
+          "end-timestamp": 1559240185158,
+          "sot": "P-ABC890",
+          "end-sot": "SO"
+        },
+        {
+          "key": "vnf-type",
+          "value": "example-vnf-type-val-3979",
+          "timestamp": 1558031808199,
+          "end-timestamp": 1559234935335,
+          "sot": "H-ABC890",
+          "end-sot": "SO-dev"
+        },
+        {
+          "key": "ipv4-loopback0-address",
+          "value": "ipv4-loopback0-address-BAD-one",
+          "timestamp": 1558031823773,
+          "end-timestamp": 1558031839071,
+          "sot": "B-ABC890",
+          "end-sot": "M-ABC890"
+        },
+        {
+          "key": "ipv4-loopback0-address",
+          "value": "ipv4-loopback0-address-ALL-GOOD-one",
+          "timestamp": 1558031839071,
+          "sot": "M-ABC890"
+        },
+        {
+          "key": "vnf-type",
+          "value": "example-vnf-type-val-3979-type-1",
+          "timestamp": 1559234935335,
+          "end-timestamp": 1559235872827,
+          "sot": "SO-dev",
+          "end-sot": "SO-dev"
+        },
+        {
+          "key": "vnf-type",
+          "value": "example-vnf-type-val-3979-type-2",
+          "timestamp": 1559235872827,
+          "end-timestamp": 1559237141294,
+          "sot": "SO-dev",
+          "end-sot": "SO"
+        },
+        {
+          "key": "vnf-type",
+          "value": "vnf-type-onap-sic",
+          "timestamp": 1559237141294,
+          "sot": "SO"
+        },
+        {
+          "key": "in-maint",
+          "value": true,
+          "timestamp": 1559237213226,
+          "end-timestamp": 1559240185158,
+          "sot": "SO",
+          "end-sot": "SO"
+        },
+        {
+          "key": "orchestration-status",
+          "value": "INACTIVE",
+          "timestamp": 1559240185158,
+          "end-timestamp": 1559248669446,
+          "sot": "SO",
+          "end-sot": "TESTSOURCE"
+        },
+        {
+          "key": "in-maint",
+          "value": false,
+          "timestamp": 1559240185158,
+          "end-timestamp": 1559248669446,
+          "sot": "SO",
+          "end-sot": "TESTSOURCE"
+        },
+        {
+          "key": "prov-status",
+          "value": "PRE-PROV",
+          "timestamp": 1559240185158,
+          "end-timestamp": 1559248669446,
+          "sot": "SO",
+          "end-sot": "TESTSOURCE"
+        },
+        {
+          "key": "orchestration-status",
+          "value": "ACTIVE",
+          "timestamp": 1559248669446,
+          "sot": "TESTSOURCE"
+        },
+        {
+          "key": "in-maint",
+          "value": true,
+          "timestamp": 1559248669446,
+          "sot": "TESTSOURCE"
+        },
+        {
+          "key": "prov-status",
+          "value": "PROV",
+          "timestamp": 1559248669446,
+          "sot": "TESTSOURCE"
+        }
+      ],
+      "related-to": [
+        {
+          "id": "4152",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "license",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/licenses/license/license-test-1-ABC890/license-test-2-ABC890",
+          "timestamp": 1558031744142,
+          "end-timestamp": 1558031854596,
+          "sot": "F-Test-ABC890",
+          "end-sot": "M-ABC890"
+        },
+        {
+          "id": "8312",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "license",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/licenses/license/license-test-1-ABC890/license-test-2-ABC890",
+          "timestamp": 1558031870276,
+          "end-timestamp": 0,
+          "sot": "N-ABC890",
+          "end-sot": ""
+        },
+        {
+          "id": "8352",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "entitlement",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/entitlements/entitlement/entitlement-test-11-ABC890/entitlement-test-12-ABC890",
+          "timestamp": 1558031744433,
+          "end-timestamp": 1558031885834,
+          "sot": "F-Test-ABC890",
+          "end-sot": "S-ABC890"
+        },
+        {
+          "id": "12344",
+          "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+          "node-type": "entitlement",
+          "url": "/aai/v15/network/generic-vnfs/generic-vnf/generic-vnf-test-0-ABC890/entitlements/entitlement/entitlement-test-21-ABC890/entitlement-test-22-ABC890",
+          "timestamp": 1558031901473,
+          "end-timestamp": 0,
+          "sot": "R-ABC890",
+          "end-sot": ""
+        },
+        {
+          "id": "8248",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "pserver",
+          "url": "/aai/v15/cloud-infrastructure/pservers/pserver/pserver-test-1-ABC890",
+          "timestamp": 1558031744746,
+          "end-timestamp": 0,
+          "sot": "F-Test-ABC890",
+          "end-sot": ""
+        },
+        {
+          "id": "8400",
+          "relationship-label": "tosca.relationships.HostedOn",
+          "node-type": "vserver",
+          "url": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/cr-test-5-ABC890/cr-test-6-ABC890/tenants/tenant/tenant-test-3-ABC890/vservers/vserver/vserver-test-3-ABC890",
+          "timestamp": 1558031746239,
+          "end-timestamp": 0,
+          "sot": "F-Test-ABC890",
+          "end-sot": ""
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/app/assets/stubs/nodeLifeCycleSince.json b/src/app/assets/stubs/nodeLifeCycleSince.json
new file mode 100644
index 0000000..5d7fe11
--- /dev/null
+++ b/src/app/assets/stubs/nodeLifeCycleSince.json
@@ -0,0 +1,84 @@
+{
+  "results": [
+    {
+      "id": "4256",
+      "node-type": "generic-vnf",
+      "url": "/aai/v15/network/generic-vnfs/generic-vnf/testapp1",
+      "properties": [
+        {
+          "key": "vnf-type",
+          "value": "example-vnf-type-val-3979-type-1",
+          "timestamp": 1559234935335,
+          "end-timestamp": 1559235872827,
+          "sot": "testsource-dev",
+          "end-sot": "testsource-dev"
+        },
+        {
+          "key": "vnf-type",
+          "value": "example-vnf-type-val-3979-type-2",
+          "timestamp": 1559235872827,
+          "end-timestamp": 1559237141294,
+          "sot": "testsource-dev",
+          "end-sot": "SO"
+        },
+        {
+          "key": "vnf-type",
+          "value": "vnf-type-onap-sic",
+          "timestamp": 1559237141294,
+          "sot": "SO"
+        },
+        {
+          "key": "in-maint",
+          "value": true,
+          "timestamp": 1559237213226,
+          "end-timestamp": 1559240185158,
+          "sot": "SO",
+          "end-sot": "SO"
+        },
+        {
+          "key": "orchestration-status",
+          "value": "INACTIVE",
+          "timestamp": 1559240185158,
+          "end-timestamp": 1559248669446,
+          "sot": "SO",
+          "end-sot": "TESTSOURCE"
+        },
+        {
+          "key": "in-maint",
+          "value": false,
+          "timestamp": 1559240185158,
+          "end-timestamp": 1559248669446,
+          "sot": "SO",
+          "end-sot": "TESTSOURCE"
+        },
+        {
+          "key": "prov-status",
+          "value": "PRE-PROV",
+          "timestamp": 1559240185158,
+          "end-timestamp": 1559248669446,
+          "sot": "SO",
+          "end-sot": "TESTSOURCE"
+        },
+        {
+          "key": "orchestration-status",
+          "value": "ACTIVE",
+          "timestamp": 1559248669446,
+          "sot": "TESTSOURCE"
+        },
+        {
+          "key": "in-maint",
+          "value": true,
+          "timestamp": 1559248669446,
+          "sot": "TESTSOURCE"
+        },
+        {
+          "key": "prov-status",
+          "value": "PROV",
+          "timestamp": 1559248669446,
+          "sot": "TESTSOURCE"
+        }
+      ],
+      "related-to": []
+    }
+  ]
+}
diff --git a/src/app/browse/Browse.jsx b/src/app/browse/Browse.jsx
new file mode 100644
index 0000000..918388a
--- /dev/null
+++ b/src/app/browse/Browse.jsx
@@ -0,0 +1,83 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, { Component } from 'react';
+import BrowseGallery from './BrowseGallery.jsx';
+import { GlobalExtConstants }  from 'utils/GlobalExtConstants.js';
+import {ExportExcel} from 'utils/ExportExcel.js';
+
+let INVLIST = GlobalExtConstants.INVLIST;
+let getDescriptionForNodes = ExportExcel.getDescriptionForNodes;
+
+/**
+ *  The Browse container is responsible for the browse page in the app.
+ *  This container displays all the different node types you can explore,
+ *  and provides links to navigate to the Model container where you can explore
+ *  specific nodes.
+ */
+
+let invList = null;
+
+class Browse extends Component {
+  
+  render() {
+    // Grab the inv list json file, map all the node types and sort it
+    const invKeys = Object.keys(INVLIST.INVENTORYLIST);
+
+    invList = invKeys.map(item => {
+      return { item: item, detail: INVLIST.INVENTORYLIST[item] };
+    });
+
+
+    invList.sort((a, b) => {
+      var displayA = a.detail.display.toLowerCase();
+      var displayB = b.detail.display.toLowerCase();
+
+      if (displayA < displayB) {
+        return -1;
+      }
+
+      if (displayA > displayB) {
+        return 1;
+      }
+
+      return 0;
+    });
+
+    let nodesDesc=getDescriptionForNodes();
+    return (
+     <div>
+        <header className='addPadding jumbotron my-4'>
+          <h1 className='display-2'>Browse Network Elements</h1>
+          <p className='lead'>
+            On this page you have the ability to browse the entire inventory of the database by network element type. Simply choose the network element type you would like to browse.
+          </p>
+        </header>
+        <div className='browse-content'>
+          <BrowseGallery
+            invList={invList} 
+            descriptionList={nodesDesc}/>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default Browse;
diff --git a/src/app/browse/BrowseCard.jsx b/src/app/browse/BrowseCard.jsx
new file mode 100644
index 0000000..dafb878
--- /dev/null
+++ b/src/app/browse/BrowseCard.jsx
@@ -0,0 +1,45 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React from 'react';
+import Col from 'react-bootstrap/lib/Col';
+import { Link } from 'react-router-dom';
+
+const BrowseCard = (props) => (
+<Link to={'/model/' + props.browseModel}>
+  <Col lg={2} md={3} sm={4}>
+    <div className='card' title={props.browseDesc}>
+      <div className='card-content browse-card-content'>
+        <i className={props.browseIcon} aria-hidden='true'> </i>
+        <div className='card-block'>
+          <h3 className='card-title'>
+            {props.browseName}
+          </h3>
+        </div>
+      </div>
+      <div className='card-footer'>
+          <button type='button' className='btn btn-outline-primary'>Browse</button>
+      </div>
+    </div>
+  </Col>
+  </Link>
+);
+
+export default BrowseCard;
diff --git a/src/app/browse/BrowseConstants.js b/src/app/browse/BrowseConstants.js
new file mode 100644
index 0000000..4060806
--- /dev/null
+++ b/src/app/browse/BrowseConstants.js
@@ -0,0 +1,19 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
diff --git a/src/app/browse/BrowseGallery.jsx b/src/app/browse/BrowseGallery.jsx
new file mode 100644
index 0000000..6ead03c
--- /dev/null
+++ b/src/app/browse/BrowseGallery.jsx
@@ -0,0 +1,51 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React from 'react';
+import BrowseCard from 'app/browse/BrowseCard.jsx';
+import Grid from 'react-bootstrap/lib/Grid';
+import Row from 'react-bootstrap/lib/Row';
+
+const browseGallery = (props) => {
+	
+	// Build all the BrowseCards
+	const cards = props.invList.map((item) => {
+		return (
+			<BrowseCard
+				key={item.item}
+				browseItem={item.item}
+				browseName={item.detail.display}
+				browseModel={item.detail.modelPath}
+				browseIcon={item.detail.icon}
+				browsePath={item.detail.apiPath} 
+				browseDesc={props.descriptionList[0][item.detail.modelPath]}/>
+		);
+	});
+	// Return jsx to caller
+	return (
+		<Grid>
+			<Row className='show-grid'>
+				{cards}
+			</Row>
+		</Grid>
+	);
+};
+
+export default browseGallery;
diff --git a/src/app/byoq/CustomDSLSaveLoad.jsx b/src/app/byoq/CustomDSLSaveLoad.jsx
new file mode 100644
index 0000000..e106e4a
--- /dev/null
+++ b/src/app/byoq/CustomDSLSaveLoad.jsx
@@ -0,0 +1,842 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, { Component } from 'react';
+
+import commonApi from 'utils/CommonAPIService.js';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+import Spinner from 'utils/SpinnerContainer.jsx';
+import Grid from 'react-bootstrap/lib/Grid';
+import Row from 'react-bootstrap/lib/Row';
+import Col from 'react-bootstrap/lib/Col';
+import Button from 'react-bootstrap/lib/Button';
+import Modal from 'react-bootstrap/lib/Modal';
+import Tabs from 'react-bootstrap/lib/Tabs';
+import Tab from 'react-bootstrap/lib/Tab';
+import Pagination from 'react-js-pagination';
+import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger';
+import Tooltip from 'react-bootstrap/lib/Tooltip';
+import Panel from 'react-bootstrap/lib/Panel';
+import {GeneralCommonFunctions} from 'utils/GeneralCommonFunctions.js';
+import Alert from 'react-bootstrap/lib/Alert';
+import MultiSelectDropDown from 'generic-components/MultiSelectDropDown.jsx';
+let ENVIRONMENT = GlobalExtConstants.ENVIRONMENT;
+let APERTURE_SERVICE = JSON.parse(sessionStorage.getItem(ENVIRONMENT + 'APERTURE_SERVICE'));
+
+let INVLIST = GlobalExtConstants.INVLIST;
+
+const settings = {
+	'NODESERVER': INVLIST.NODESERVER,
+	'PROXY': INVLIST.PROXY,
+  	'PREFIX': INVLIST.PREFIX,
+  	'VERSION': INVLIST.VERSION,
+    'USESTUBS': INVLIST.useStubs,
+    'TABULAR': INVLIST.TABULAR,
+    'APERTURE': INVLIST.APERTURE,
+    'TABULARVERSION': INVLIST.TABULARVERSION
+};
+
+/**
+ * This class is used to handle any saving or loading of dsl queries
+ */
+
+class CustomDSLSaveLoad extends Component {
+
+  constructor(props) {
+    console.log(props);
+    super(props);
+    APERTURE_SERVICE=JSON.parse(sessionStorage.getItem(ENVIRONMENT + 'APERTURE_SERVICE'));
+    this.state = {
+        enablePublicQueriesBusyFeedback: false,
+        enableCommunityQueriesBusyFeedback: false,
+        enablePersonalQueriesBusyFeedback: false,
+        enableDeleteBusyFeedback: false,
+        loadedPublicQueries: [],
+        loadedCommunityQueries: [],
+        loadedPersonalQueries: [],
+        filteredPublicEntries: [],
+        filteredCommunityEntries: [],
+        filteredPersonalEntries: [],
+        initialFilteredPublicEntries: [],
+        initialFilteredCommunityEntries: [],
+        initialFilteredPersonalEntries:[],
+        totalPublicResults: 0,
+        totalCommunityResults: 0,
+        totalPersonalResults: 0,
+        queriesPublicErrMsg: false,
+        queriesCommunityErrMsg: false,
+        queriesPersonalErrMsg: false,
+        deleteErrMsg: false,
+        deleteSuccessfulMsg: false,
+        focusedEntryName: '',
+        focusedEntryType: false,
+        showDeleteModal: false,
+        filterPublicCriteria: '',
+        filterCommunityCriteria: '',
+        filterPersonalCriteria: '',
+        displayValue:'Category',
+        selectedOption:{"public":[],"community":[],"personal":[]},
+        filterText:'',
+        activeType:'public',
+        queryId:'',
+        loadQueryList:[],
+        publicLoadQueryList:[],
+        personalLoadQueryList:[],
+        communityLoadQueryList:[],
+        loadQueryLimit:parseInt(sessionStorage.getItem(ENVIRONMENT + 'LOADTEMPLATE_MAX_COUNT')),
+        loadQueryFlag:true,
+        selectedCount:0
+    };
+    settings['ISAPERTURE']=APERTURE_SERVICE;
+  }
+  componentDidMount = () => {
+    this.setState({enablePersonalQueriesBusyFeedback:true,enablePublicQueriesBusyFeedback:true,enableCommunityQueriesBusyFeedback:true});
+    this.getQueries();
+  };
+  componentWillUnmount  = () => {};
+
+  filterPublicList = (event) =>{
+      this.filterPublicListWithCategory(event.target.value);
+  }
+  filterPublicListWithCategory = (value) =>{
+     var updatedList = this.state.loadedPublicQueries;
+     updatedList = Object.keys(updatedList).filter(key => {
+        return JSON.stringify(updatedList[key]).toLowerCase().search(value.toLowerCase()) !== -1;
+     }).reduce( (res, key) => Object.assign(res, { [key]: updatedList[key] }), {} );     
+     let filterList=this.filterUpdatedList(updatedList, "public");
+     console.log('filterPublicListWithCategory filterList>>>>>',filterList);
+     this.setState({filteredPublicEntries: filterList, totalPublicResults: Object.keys(filterList).length, filterPublicCriteria: value,filterText: value.toLowerCase()});
+   }
+  filterCommunityList = (event) =>{
+      this.filterCommunityListWithCategory(event.target.value);
+  }
+  filterCommunityListWithCategory = (value) =>{
+     var updatedList = this.state.loadedCommunityQueries;
+     updatedList = Object.keys(updatedList).filter(key => {
+        return JSON.stringify(updatedList[key]).toLowerCase().search(value.toLowerCase()) !== -1;
+     }).reduce( (res, key) => Object.assign(res, { [key]: updatedList[key] }), {} );
+     let filterList=this.filterUpdatedList(updatedList, "community");
+     console.log('filterCommunityListWithCategory filterList>>>>>',filterList);
+     this.setState({filteredCommunityEntries: filterList, totalCommunityResults: Object.keys(filterList).length, filterCommunityCriteria: value,filterText: value.toLowerCase()});
+  }
+  filterPersonalList = (event) =>{
+      this.filterPersonalListWithCategory(event.target.value);
+  }
+  filterPersonalListWithCategory =(value) =>{
+     var updatedList = this.state.loadedPersonalQueries;
+     updatedList = Object.keys(updatedList).filter(key => {
+        return JSON.stringify(updatedList[key]).toLowerCase().search(value.toLowerCase()) !== -1;
+     }).reduce( (res, key) => Object.assign(res, { [key]: updatedList[key] }), {} );
+     let filterList=this.filterUpdatedList(updatedList, "personal");
+     console.log('filterPersonalListWithCategory filterList>>>>>',filterList);     
+     this.setState({filteredPersonalEntries: filterList, totalPersonalResults: Object.keys(filterList).length, filterPersonalCriteria: value,filterText: value.toLowerCase()});
+  }
+  filterUpdatedList = (updatedList, type) =>{
+    let selectedCategory = this.state.selectedOption[type];
+    let filterList = [];
+    let selectedOption = [];
+    if(selectedCategory.length > 0){
+       selectedOption = Object.keys(selectedCategory).map((index)=>{
+           return selectedCategory[index].value;
+       }); 
+       Object.keys(updatedList).map((key) => {
+           Object.keys(updatedList[key]).map((entry) => {
+               if(entry === 'category' && selectedOption.indexOf(updatedList[key][entry]) !==-1){
+                   filterList[key]=updatedList[key];                  
+               }
+           })
+       });
+    }else{
+       filterList=updatedList;
+    }
+    return filterList;
+  }
+  processQueryResponse = (res) => {
+    var formattedList = [];
+    for(var i = 0; i < res.length; i++){
+        var newQueryObj = {};
+        var requiredFieldCount = 0;
+        if(res[i]){
+            newQueryObj.isSelect=false;
+            newQueryObj.id = res[i].id;
+            newQueryObj['is_aggregate'] = false;
+            newQueryObj['is_public'] = false;
+            newQueryObj['community_shared'] = false;
+            newQueryObj['template_details'] = [];
+            for(var j = 0; j < res[i].cols.length; j++){
+                if(res[i].cols[j].name){
+                    if(res[i].cols[j].name === 'query_name'){
+                        requiredFieldCount++;
+                        newQueryObj.name = res[i].cols[j].value;
+                    }
+                    if(res[i].cols[j].name === 'creator'){
+                        requiredFieldCount++;
+                        newQueryObj.creator = res[i].cols[j].value;
+                    }
+                    if(res[i].cols[j].name === 'dsl'){
+                        requiredFieldCount++;
+                        newQueryObj.dsl = res[i].cols[j].value;
+                    }
+                    if(res[i].cols[j].name === 'description'){
+                        newQueryObj.description = res[i].cols[j].value;
+                    }
+                    if(res[i].cols[j].name === 'is_aggregate'){
+                        newQueryObj['is_aggregate'] = res[i].cols[j].value;
+                    }
+                    if(res[i].cols[j].name === 'is_public'){
+                        newQueryObj['is_public'] = res[i].cols[j].value;
+                    }
+                    if(res[i].cols[j].name === 'community_shared'){
+                        newQueryObj['community_shared'] = res[i].cols[j].value;
+                    }
+                    if(res[i].cols[j].name === 'template_details'){
+                        newQueryObj['template_details'] = res[i].cols[j].value;
+                    }
+                    if(res[i].cols[j].name === 'category'){
+                        newQueryObj['category'] = res[i].cols[j].value;
+                    }
+                }
+            }
+            newQueryObj.version = res[i].version;
+        }
+        if(requiredFieldCount === 3){
+            formattedList[res[i].id] = newQueryObj;
+        }else{
+            console.log('Issue occurred on query list processing for the following element: ' + JSON.stringify(newQueryObj));
+        }
+    }
+    return formattedList;
+  }
+  
+  getPublicQueries = () => {
+    settings['ISTABULAR'] = true;
+    return new Promise((resolve, reject) => {
+                        commonApi(settings, 'queries/is_public=true', 'GET', null, 'BYOQPublicQueries', GlobalExtConstants.OVERRIDE_DOMAIN)
+                        		.then(res => {
+                        			console.log('res:' + res.data, 'load');
+                        			if(res.status === 200 || res.status === 404){
+                        			    if(res.data.status && (res.data.status !== 200 && res.data.status !== 201 && res.data.status !== 404)){
+                        			        this.triggerError(res.data);
+                        			    }else{
+                        			        var list = this.processQueryResponse(res.data);
+                        			        this.setState({
+                                             enablePublicQueriesBusyFeedback:false,
+                                             filteredPublicEntries: list,
+                                             initialFilteredPublicEntries: list,
+                                             totalPublicResults: Object.keys(list).length,
+                                             loadedPublicQueries: list
+                                             });
+                                          this.runPublicFilter();
+                                          resolve(list);
+                                      }
+                                  }else{
+                                    this.triggerError(res.data, 'public_load');
+                                  }
+                                resolve([]);
+                        		}, error=>{
+                        		    if(error.response.status === 404){
+                        		        this.setState({
+                                                      enablePublicQueriesBusyFeedback:false,
+                                                      filteredPublicEntries: [],
+                                                      totalPublicResults: 0,
+                                                      initialFilteredPublicEntries:[],
+                                                      loadedPublicQueries: []
+                                                    });
+                        		    }else{
+                        		        this.triggerError(error.response.data, 'public_load');
+                        		    }
+                        		    resolve([]);
+                        		}).catch(error => {
+                        		    this.triggerError(error, 'public_load');
+                        		    resolve([]);
+                            })
+                        })
+    }
+  getCommunityQueries = () => {
+      settings['ISTABULAR'] = true;
+      return new Promise((resolve, reject) => {
+                          commonApi(settings, 'queries/community_shared=true', 'GET', null, 'BYOQCommunityQueries', GlobalExtConstants.OVERRIDE_DOMAIN)
+                          		.then(res => {
+                          			console.log('res:' + res.data, 'load');
+                          			if(res.status === 200 || res.status === 404){
+                          			    if(res.data.status && (res.data.status !== 200 && res.data.status !== 201 && res.data.status !== 404)){
+                          			        this.triggerError(res.data);
+                          			    }else{
+                          			        var list = this.processQueryResponse(res.data);
+                          			        this.setState({
+                                               enableCommunityQueriesBusyFeedback:false,
+                                               filteredCommunityEntries: list,
+                                               initialFilteredCommunityEntries: list,
+                                               totalCommunityResults: Object.keys(list).length,
+                                               loadedCommunityQueries: list
+                                               });
+                                            this.runCommunityFilter();
+                                            resolve(list);
+                                        }
+                                    }else{
+                                      this.triggerError(res.data, 'community_load');
+                                    }
+                                  resolve([]);
+                          		}, error=>{
+                          		    if(error.response.status === 404){
+                          		        this.setState({
+                                                        enableCommunityQueriesBusyFeedback:false,
+                                                        filteredCommunityEntries: [],
+                                                        totalCommunityResults: 0,
+                                                        initialFilteredCommunityEntries:[],
+                                                        loadedCommunityQueries: []
+                                                      });
+                          		    }else{
+                          		        this.triggerError(error.response.data, 'community_load');
+                          		    }
+                          		    resolve([]);
+                          		}).catch(error => {
+                          		    this.triggerError(error, 'community_load');
+                          		    resolve([]);
+                              })
+                          })
+  }
+  getPrivateQueries = () => {
+        settings['ISTABULAR'] = true;
+        let query='queries/is_public=false';
+        if(sessionStorage.getItem(GlobalExtConstants.ENVIRONMENT + 'userId')){
+            query+='&creator=' + sessionStorage.getItem(GlobalExtConstants.ENVIRONMENT + 'userId');
+        }        
+        return new Promise((resolve, reject) => {
+          commonApi(settings, 'queries/is_public=false&creator=' + sessionStorage.getItem(GlobalExtConstants.ENVIRONMENT + 'userId'), 'GET', null, 'BYOQPersonalQueries', GlobalExtConstants.OVERRIDE_DOMAIN)
+          		.then(res => {
+          			console.log('res:' + res.data, 'load');
+          			if(res.status === 200 || res.status === 404){
+          			    if(res.data.status && (res.data.status !== 200 && res.data.status !== 201 && res.data.status !== 404)){
+          			        this.triggerError(res.data);
+          			    }else{
+          			        var list = this.processQueryResponse(res.data);
+          			        this.setState({
+                                 enablePersonalQueriesBusyFeedback:false,
+                                 filteredPersonalEntries: list,
+                                 initialFilteredPersonalEntries: list,
+                                 totalPersonalResults: Object.keys(list).length,
+                                 loadedPersonalQueries: list
+                                 });
+                              this.runPersonalFilter();
+                              resolve(list);
+                          }
+                      }else{
+                        this.triggerError(res.data, 'personal_load');
+                      }
+                      resolve([]);
+          		}, error=>{
+          		    if(error.response.status === 404){
+          		        this.setState({
+                                          enablePersonalQueriesBusyFeedback:false,
+                                          filteredPersonalEntries: [],
+                                          initialFilteredPersonalEntries: [],
+                                          totalPersonalResults: 0,
+                                          loadedPersonalQueries: []
+                                        });
+          		    }else{
+          		        this.triggerError(error.response.data, 'personal_load');
+          		    }
+          		     resolve([]);
+          		}).catch(error => {
+          		    this.triggerError(error, 'personal_load');
+          		    resolve([]);
+                })
+           })
+  }
+  getQueries = () =>{
+    var state = this;
+    this.getCommunityQueries();
+    Promise.all([
+      this.getPublicQueries(),
+      this.getPrivateQueries()
+      ])
+      .then(function (responses) {
+      	var result = Object.assign({}, responses[0], responses[1]);
+        state.props.setQueriesState(result);
+        state.setState({loadQueryList:[],publicLoadQueryList:[],personalLoadQueryList:[],communityLoadQueryList:[],selectedCount:0});
+      }).catch(function (error) {
+      	console.log(error);
+      });
+  };
+  triggerError = (error, type) => {
+    console.error('[CustomDslSaveLoad.jsx] error : ', JSON.stringify(error));
+  	let errMsg = '';
+  	if(error.status && error.message){
+  	    errMsg += "Error Occurred: " + error.status + ' - ' +error.message;
+  	}else{
+  	    errMsg += "Error Occurred: " + JSON.stringify(error);
+  	}
+  	console.log(errMsg);
+  	if(type === 'public_load'){
+        this.setState({queriesPublicErrMsg:errMsg,
+                       enablePublicQueriesBusyFeedback:false,
+                       filteredPublicEntries: [],
+                       totalPublicResults: 0,
+                       loadedPublicQueries: []});
+        var result = Object.assign({}, [], this.state.loadedPersonalQueries);
+        this.props.setQueriesState(result);
+    }else if(type === 'personal_load'){
+        this.setState({queriesPersonalErrMsg:errMsg,
+                       enablePersonalQueriesBusyFeedback:false,
+                       filteredPersonalEntries: [],
+                       totalPersonalResults: 0,
+                       loadedPersonalQueries: []});
+        var result = Object.assign({}, this.state.loadedPublicQueries, []);
+        this.props.setQueriesState(result);
+    }else if(type === 'community_load'){
+        this.setState({queriesCommunityErrMsg:errMsg,
+                       enableCommunityQueriesBusyFeedback:false,
+                       filteredCommunityEntries: [],
+                       totalCommunityResults: 0,
+                       loadedCommunityQueries: []});
+        var result = Object.assign({}, this.state.loadedCommunityQueries, []);
+        this.props.setQueriesState(result);
+    }else if (type === 'delete'){
+        this.setState({deleteErrMsg: errMsg + " - Failed to delete query : " + this.state.focusedEntryName, enableDeleteBusyFeedback:false});
+        GeneralCommonFunctions.scrollTo("deleteError");
+    }else{
+        console.log('[CustomDslSaveLoad.jsx] :: triggerError invoked with invalid type : ' + type);
+    }
+  }
+
+  runPublicFilter = () =>{
+    var updatedList = this.state.loadedPublicQueries;
+    updatedList = Object.keys(updatedList).filter(key => {
+                return JSON.stringify(updatedList[key]).toLowerCase().search(this.state.filterPublicCriteria.toLowerCase()) !== -1;
+             }).reduce( (res, key) => Object.assign(res, { [key]: updatedList[key] }), {} );
+             this.setState({filteredPublicEntries: updatedList, totalPublicResults: Object.keys(updatedList).length},()=>{if(this.state.selectedOption["public"].length>0){this.filterPublicListWithCategory(this.state.filterPublicCriteria)}});
+  }
+  runCommunityFilter = () =>{
+    var updatedList = this.state.loadedCommunityQueries;
+    updatedList = Object.keys(updatedList).filter(key => {
+                return JSON.stringify(updatedList[key]).toLowerCase().search(this.state.filterCommunityCriteria.toLowerCase()) !== -1;
+             }).reduce( (res, key) => Object.assign(res, { [key]: updatedList[key] }), {} );
+             this.setState({filteredCommunityEntries: updatedList, totalCommunityResults: Object.keys(updatedList).length},()=>{if(this.state.selectedOption["community"].length>0){this.filterCommunityListWithCategory(this.state.filterCommunityCriteria)}});
+  }
+  runPersonalFilter = () =>{
+    var updatedList = this.state.loadedPersonalQueries;
+    updatedList = Object.keys(updatedList).filter(key => {
+                return JSON.stringify(updatedList[key]).toLowerCase().search(this.state.filterPersonalCriteria.toLowerCase()) !== -1;
+             }).reduce( (res, key) => Object.assign(res, { [key]: updatedList[key] }), {} );
+             this.setState({filteredPersonalEntries: updatedList, totalPersonalResults: Object.keys(updatedList).length},()=>{if(this.state.selectedOption["personal"].length>0){this.filterPersonalListWithCategory(this.state.filterPersonalCriteria)}});
+  }
+
+  addElement = (element) =>{
+    var updatedList = this.state.loadedPublicQueries;
+    updatedList[element.id] = element[0];
+    this.setState({loadedPublicQueries: updatedList});
+    this.props.setQueriesState(updatedList);
+    this.runPublicFilter();
+  }
+
+  submitDelete = () =>{
+     var loadedQueries = [];
+     if(this.state.focusedEntryType === "personal"){
+        loadedQueries = this.state.loadedPersonalQueries;
+     }else{
+        loadedQueries = this.state.loadedPublicQueries;
+     }
+     this.setState({enableDeleteBusyFeedback:true});
+     settings['ISTABULAR'] = true;
+     commonApi(settings, 'queries/' + encodeURIComponent(this.state.queryId), 'DELETE', '{\"id\":\"'
+        + encodeURIComponent(this.state.queryId) + '\"}', 'BYOQDeleteQuery', GlobalExtConstants.OVERRIDE_DOMAIN, null,
+        [{
+            "name":"If-Match",
+            "value": loadedQueries[this.state.queryId].version
+         }])
+            		.then(res => {
+            			console.log('res:' + res.data);
+            			if(res.status === 200){
+            			    if(res.data.status && (res.data.status !== 200 && res.data.status !== 201)){
+            			        this.triggerError(res.data, 'delete');
+            			    }else{
+            			        var updatedList = loadedQueries;
+                                //remove the entry from the list
+                                updatedList = Object.keys(updatedList).filter(key => {
+                                   return key !== this.state.queryId;
+                                }).reduce( (res, key) => Object.assign(res, { [key]: updatedList[key] }), {} );
+                                this.setState({showDeleteModal:false,
+                                               focusedEntryName: '',
+                                               enableDeleteBusyFeedback:false,
+                                               deleteSuccessfulMsg: "Successfully deleted query : " + this.state.focusedEntryName});
+                                GeneralCommonFunctions.scrollTo("deleteSuccess");
+                                if(this.state.focusedEntryType === "personal"){
+                                   this.getCommunityQueries();
+                                   this.setState({loadedPersonalQueries: updatedList});
+                                   var result = Object.assign({}, this.state.loadedPublicQueries, updatedList);
+                                   this.props.setQueriesState(result);
+                                }else{
+                                   this.setState({loadedPublicQueries: updatedList});
+                                   var result = Object.assign({}, updatedList, this.state.loadedPersonalQueries);
+                                   this.props.setQueriesState(result);
+                                }
+                                this.runPublicFilter();
+                                this.runCommunityFilter();
+                                this.runPersonalFilter();
+                            }
+            			}else{
+            			    this.triggerError(res.data, 'delete');
+            			}
+            		}, error=>{
+            		    this.triggerError(error.response.data, 'delete');
+            		}).catch(error => {
+            		    this.triggerError(error, 'delete');
+     });
+  };
+
+  openDeleteModal = (id,name, isPublic) =>{
+    var focusedEntryType = "public";
+    if(isPublic === "true"){
+        focusedEntryType = "public";
+    }else{
+        focusedEntryType = "personal";
+    }
+    this.setState({showDeleteModal:true, focusedEntryName: name, focusedEntryType: focusedEntryType, deleteSuccessfulMsg:false, deleteErrMsg:false, queryId:id});
+  };
+
+  closeDeleteModal = () =>{
+    this.setState({showDeleteModal:false, focusedEntryName: '', focusedEntryType: false, deleteSuccessfulMsg:false, deleteErrMsg:false, queryId:''});
+  };
+
+  loadQuery = (e) =>{
+    this.loadQueryData(e.target.value,0);
+  };
+  loadQueryData=(queryTemp, id)=>{
+    let splitString = queryTemp.split('||');
+    let name = splitString[0];
+    let description = splitString[1];
+    let category=(splitString[2] !== 'undefined')? splitString[2]:'';
+    let dsl = splitString[3];
+    let isAggregate = splitString[4];
+    let type = splitString[5];
+    let queryId = splitString[6];
+    let isCommunityShared = splitString[7];
+    let templateDetails = splitString[8];
+    this.props.loadCallback(name, description, category, dsl, isAggregate, type, queryId, isCommunityShared, id, templateDetails, false);
+  };
+  loadBulkCallback =() =>{
+    this.props.loadBulkCallback(this.state.loadQueryList);
+  }
+  loadAndRunQuery = (e) =>{
+    let splitString = (e.target.value).split('||');
+    let dsl = splitString[0];
+    let isAggregate = splitString[1];
+    this.props.loadCallback('', '', '', dsl, isAggregate, null, '', null, 0, [], true);
+  };
+  onMultiSelectPublicDropdownSelect = (selectedOption) =>{
+    console.log('onMultiSelectPublicDropdownSelect selectedList',selectedOption);
+    var tempSelection = this.state.selectedOption;
+    tempSelection["public"] = selectedOption;
+    this.setState({selectedOption:tempSelection},()=>{this.filterPublicListWithCategory(this.state.filterPublicCriteria)});
+  };
+  onMultiSelectCommunityDropdownSelect = (selectedOption) =>{
+    console.log('onMultiSelectCommunityDropdownSelect selectedList',selectedOption);
+    var tempSelection = this.state.selectedOption;
+    tempSelection["community"] = selectedOption;
+    this.setState({selectedOption:tempSelection},()=>{this.filterCommunityListWithCategory(this.state.filterCommunityCriteria)});
+  };
+  onMultiSelectPersonalDropdownSelect = (selectedOption) =>{
+    console.log('onMultiSelectPersonalDropdownSelect selectedList',selectedOption);
+    var tempSelection = this.state.selectedOption;
+    tempSelection["personal"] = selectedOption;
+    this.setState({selectedOption:tempSelection},()=>{this.filterPersonalListWithCategory(this.state.filterPersonalCriteria)});
+  };
+  prepareMultiOptions = (type) => {
+    //this.setState({activeType:type});
+    let filteredEntries=[];
+    if(type==='public'){
+        filteredEntries=this.state.initialFilteredPublicEntries;
+    }else if(type==='community'){
+        filteredEntries=this.state.initialFilteredCommunityEntries;
+    }else{
+        filteredEntries=this.state.initialFilteredPersonalEntries;
+    }
+    let dupArray=[];
+    let  multiOption=Object.keys(filteredEntries).map((entry, idx) => {
+                let obj ={};
+                if(filteredEntries[entry]['category'] && dupArray.indexOf(filteredEntries[entry]['category']) === -1){
+                    obj['value']=filteredEntries[entry]['category'];
+                    obj['label']= filteredEntries[entry]['category'];
+                    dupArray.push(filteredEntries[entry]['category']);
+                }else{
+                    obj='';
+                }
+                return obj;       
+            });    
+     let filterMultiOption = multiOption.filter((entry) => {
+            if(entry !== '') return entry;             
+     });    
+     console.log('filterMultiOption>>>>>',filterMultiOption);   
+     return filterMultiOption;       
+  };
+  editSavedQuery = (e) =>{
+    let splitString = (e.target.value).split('||');
+    let name = splitString[0];
+    let description = splitString[1];
+    let category = (splitString[2] !== 'undefined')? splitString[2]:'';
+    let dsl = atob(splitString[3]).replace('<pre>','').replace('</pre>','');
+    let isAggregate = splitString[4];
+    let type = splitString[5];
+    let queryId= splitString[6];
+    let isCommunityShared = splitString[7];
+    let templateDetails = splitString[8];
+    this.props.editCallback(name, description, category, dsl, isAggregate, type, queryId, isCommunityShared, templateDetails);
+  };
+  loadAllQueries = () =>{
+    console.log('this.state.loadQueryList>>>>',this.state.loadQueryList);
+    let loadQueryList=this.state.loadQueryList;
+    for(var l=0;l<loadQueryList.length;l++){
+        this.loadQueryData(loadQueryList[l],l);
+    }
+  };
+  onSelectCheckbox=(e) =>{
+    let splitString = (e.target.value).split('||');   
+    let type = splitString[5];
+    let queryId=splitString[6];
+    let queryList='';
+    let loadQuery='';
+    if(type =='public'){
+        queryList=this.state.filteredPublicEntries;
+        loadQuery= this.state.publicLoadQueryList;
+    }else if (type == 'personal'){
+        queryList=this.state.filteredPersonalEntries;
+        loadQuery= this.state.personalLoadQueryList;        
+    }else{
+        queryList=this.state.filteredCommunityEntries;
+        loadQuery= this.state.communityLoadQueryList;
+    }
+    let flag= true;
+    if (e.target.checked) {        
+        if(loadQuery.length<10){
+            loadQuery.push(e.target.value);
+            queryList[queryId].isSelect=true;        
+        }    
+    }else{
+        let index=loadQuery.indexOf(e.target.value);
+        loadQuery.splice(index,1);
+        queryList[queryId].isSelect=false;         
+    }
+    flag=(loadQuery.length<=10)?true:false;
+    if(type=='public'){
+        this.setState({loadQueryList:loadQuery,publicLoadQueryList:loadQuery,personalLoadQueryList:[],communityLoadQueryList:[],filteredPublicEntries:queryList,loadQueryFlag:flag,selectedCount:loadQuery.length});
+    }else if(type=='personal'){
+        this.setState({loadQueryList:loadQuery,personalLoadQueryList:loadQuery,publicLoadQueryList:[],communityLoadQueryList:[],filteredPersonalEntries:queryList,loadQueryFlag:flag,selectedCount:loadQuery.length});
+    } else{
+        this.setState({loadQueryList:loadQuery,communityLoadQueryList:loadQuery,publicLoadQueryList:[],personalLoadQueryList:[],filteredCommunityEntries:queryList,loadQueryFlag:flag,selectedCount:loadQuery.length});
+    }   
+  }
+  render() {
+        let savedQueryCard = (type, totalCount, filterList, filteredEntries) =>{
+                                let onMultiSelectDropdownSelect= (type==='public') ? this.onMultiSelectPublicDropdownSelect : (type==='community') ? this.onMultiSelectCommunityDropdownSelect : this.onMultiSelectPersonalDropdownSelect;
+                                return <div className='card d3-model-card'>
+                                          <div className={'card-header ' + (this.props.isSavedQueryFlow ? 'show' : 'hidden')}>
+                                               <div>
+                                                 <h3>Find A Query</h3>
+                                               </div>
+                                          </div>
+                                          <div className='card-header'>
+                                               <div>
+                                                 <div style={{width:'82%',float:'left'}}>
+                                                    <h5>Total Saved Queries: <strong>{totalCount}</strong></h5>
+                                                 </div>
+                                                 <div className={(this.props.isSavedQueryFlow ? 'show' : 'hidden')}>
+                                                    <OverlayTrigger  placement='top' overlay={<Tooltip id='tooltip-top'>{'Enabled for up to '+this.state.loadQueryLimit+' Queries'}</Tooltip>}>
+											            <span className="d-inline-block" style={{display: 'inline-block'}}>
+                                                            <button className='btn btn-outline-primary' type='button' onClick={()=>this.loadBulkCallback()} disabled={!(this.state.loadQueryList.length<=10 && this.state.loadQueryList.length>0)}>Load Selected Queries</button>
+                                                        </span>
+                                                    </OverlayTrigger>
+                                                 </div>                                                             
+                                               </div>
+                                               <div>
+                                                   <form>
+                                                       <div className='alignFormTwinElements'>
+                                                       <fieldset className="form-group">
+                                                           <input type="text" className="form-control form-control-lg" placeholder="Search" onChange={filterList}/>
+                                                       </fieldset>
+                                                       </div>
+                                                       <div className='alignFormTwinElements'>
+                                                       <fieldset className="form-group">
+                                                            <MultiSelectDropDown
+                                                                    options={this.prepareMultiOptions(type)}
+                                                                    displayValue={this.state.displayValue}
+                                                                    triggerSelect={onMultiSelectDropdownSelect}
+                                                            />
+                                                        </fieldset>
+                                                       </div>
+                                                   </form>
+                                               </div>
+                                          </div>
+                                          <div className='card-content model-card-content'>
+                                                 <table className="table table-hover table-striped">
+                                                   <thead>
+                                                     <tr>
+                                                       <th scope='col' className={(this.props.isSavedQueryFlow ? 'show' : 'hidden')}>Select</th>
+                                                       <th scope="col">Name</th>
+                                                       <th scope="col">Description</th>
+                                                       <th scope="col">Category</th>
+                                                       <th scope="col">Creator</th>
+                                                       <th scope="col">Aggregate</th>
+                                                       <th scope="col" className={((type === 'personal') ? '' : 'hidden')}>Shared</th>
+                                                       <th scope="col">Actions</th>
+                                                     </tr>
+                                                   </thead>
+                                                   <tbody>
+                                                   {Object.keys(filteredEntries).sort(function(a, b) {
+                                                                                                      var compareA = a.toUpperCase();
+                                                                                                      var compareB = b.toUpperCase();
+                                                                                                      if(compareA < compareB) return -1;
+                                                                                                      if(compareA > compareB) return 1;
+                                                                                                      return 0;
+                                                                                                     }).map((entry, idx) => {                                                                                                        
+                                                                                                     return (                                                                                                     
+                                                                                                       <tr>
+                                                                                                         <td className={(this.props.isSavedQueryFlow ? '' : 'hidden')}>
+                                                                                                            <div className="checkbox">
+                                                                                                            <OverlayTrigger  placement='top' overlay={<Tooltip id='tooltip-top'>{(this.state.selectedCount===this.state.loadQueryLimit)?'Reached Maximun Template Count '+this.state.loadQueryLimit:(this.state.loadQueryLimit-this.state.selectedCount)+' More Selectable'}</Tooltip>}>
+                 		    	 	                                                                            <span className="d-inline-block" style={{display: 'inline-block'}}>						    				
+                                                                                                                <label>
+                                                                                                                    <input type="checkbox" checked={filteredEntries[entry].isSelect} onChange={this.onSelectCheckbox.bind(this)} value={filteredEntries[entry].name + '||' + filteredEntries[entry].description + '||' + filteredEntries[entry].category + '||' + filteredEntries[entry].dsl + '||' + filteredEntries[entry]['is_aggregate'] + '||' +  type + '||' + entry + '||' + filteredEntries[entry]['community_shared'] + '||' + filteredEntries[entry]['template_details']} disabled={!filteredEntries[entry].isSelect && !this.state.loadQueryFlag}/>
+                                                                                                                </label>
+                                                                                                                </span>
+                                                                                                            </OverlayTrigger>
+                                                                                                            </div>
+                                                                                                        </td>
+                                                                                                         <td><strong>{filteredEntries[entry].name}</strong></td>
+                                                                                                         <td>{filteredEntries[entry].description}</td>
+                                                                                                         <td width='15%'>{(filteredEntries[entry].category)?filteredEntries[entry].category:''}</td>
+                                                                                                         <td>{filteredEntries[entry].creator}</td>
+                                                                                                         <td>{filteredEntries[entry]['is_aggregate']}</td>
+                                                                                                         <td className={((type === 'personal') ? '' : 'hidden')}>{filteredEntries[entry]['community_shared']}</td>
+                                                                                                         <td className="actionsRow">
+                                                                                                             <div>
+                                                                                                         	    <button className={'btn btn-primary ' + (!this.props.isDSLBuilder ? '' : 'hidden')} type='button' value={filteredEntries[entry].dsl + "||" + filteredEntries[entry]['is_aggregate']} onClick={this.loadAndRunQuery}>Run</button>
+                                                                                                         	    <button className='btn btn-outline-secondary' type='button' value={filteredEntries[entry].name + '||' + filteredEntries[entry].description + '||' + filteredEntries[entry].category + '||' + filteredEntries[entry].dsl + '||' + filteredEntries[entry]['is_aggregate'] + '||' +  type + '||' + entry + '||' + filteredEntries[entry]['community_shared'] + '||' + filteredEntries[entry]['template_details']  } onClick={this.loadQuery}>Load</button>
+                                                                                                                <button className={'btn btn-outline-secondary ' + ((this.props.isDataSteward || type === 'personal') && type !== 'community' && !this.props.isDSLBuilder ? '' : 'hidden')} type='button' value={filteredEntries[entry].name + '||' + filteredEntries[entry].description + '||' + filteredEntries[entry].category + '||' + filteredEntries[entry].dsl + '||' + filteredEntries[entry]['is_aggregate'] + '||' +  type +'||' + entry + '||' + filteredEntries[entry]['community_shared'] + '||' + filteredEntries[entry]['template_details']} onClick={this.editSavedQuery}>Edit</button>
+                                                                                                                <button className={'btn btn-outline-secondary ' + ((this.props.isDataSteward || type === 'personal') && type !== 'community' && !this.props.isDSLBuilder ? '' : 'hidden')} type='button' onClick={(e) => this.openDeleteModal(entry,filteredEntries[entry].name, filteredEntries[entry]['is_public'])}>Delete</button>
+                                                                                                             </div>
+                                                                                                         </td>
+                                                                                                       </tr>
+                                                                                                     );
+                                                                                             })}
+                                                   </tbody>
+                                                 </table>
+                                          </div>
+                                      </div>};
+        let savedQueryMessaging = (type, loadedQueries, queryErrMsg) => { return <Col>
+                                <Alert className={!queryErrMsg ? 'show' : 'hidden'} bsStyle="warning">
+                                    {type === 'public' && <h3>No Saved Public Queries Loaded</h3>}
+                                    {type === 'community' && <h3>No Saved Community Shared Queries Loaded</h3>}
+                                    {type === 'personal' && <h3>No Saved Personal Queries Loaded</h3>}
+                                </Alert>
+                                <Alert bsStyle="danger" className={queryErrMsg ? 'show' : 'hidden'} onDismiss={() => {
+                                                                                                                   if(type==='public'){
+                                                                                                                      this.setState({queriesPublicErrMsg: false});
+                                                                                                                   }else if (type === 'community'){
+                                                                                                                      this.setState({queriesCommunityErrMsg: false});
+                                                                                                                   }else{
+                                                                                                                      this.setState({queriesPersonalErrMsg: false});
+                                                                                                                   }}}>
+                                    <h3>An error occurred</h3>
+                                    <p>
+                                      {queryErrMsg}
+                                    </p>
+                                </Alert>
+                              </Col>
+        }
+        let savedQueryTabs = () => { return <Tabs defaultActiveKey={'1'} id="multipleTabularView">
+                                                <Tab eventKey={'1'} title={'Public'}>
+                                                    <Spinner loading={this.state.enablePublicQueriesBusyFeedback}>
+                                                        {Object.keys(this.state.loadedPublicQueries).length <= 0 && (<div>{savedQueryMessaging('public', this.state.loadedPublicQueries, this.state.queriesPublicErrMsg)}</div>)}
+                                           	            {Object.keys(this.state.loadedPublicQueries).length > 0 && (<div>{savedQueryCard('public', this.state.totalPublicResults, this.filterPublicList, this.state.filteredPublicEntries)}</div>)}
+                                           	        </Spinner>
+                                           	    </Tab>
+                                           	    <Tab eventKey={'2'} title={'Community'}>
+                                                    <Spinner loading={this.state.enableCommunityQueriesBusyFeedback}>
+                                                        {Object.keys(this.state.loadedCommunityQueries).length <= 0 && (<div>{savedQueryMessaging('community', this.state.loadedCommunityQueries, this.state.queriesCommunityErrMsg)}</div>)}
+                                                        {Object.keys(this.state.loadedCommunityQueries).length > 0 && (<div>{savedQueryCard('community', this.state.totalCommunityResults, this.filterCommunityList, this.state.filteredCommunityEntries)}</div>)}
+                                                    </Spinner>
+                                                </Tab>
+                                           	    <Tab eventKey={'3'} title={'My Personal Queries'}>
+                                           	       <Spinner loading={this.state.enablePersonalQueriesBusyFeedback}>
+                                           	            {Object.keys(this.state.loadedPersonalQueries).length <= 0 &&(<div>{savedQueryMessaging('personal', this.state.loadedPersonalQueries, this.state.queriesPersonalErrMsg)}</div>)}
+                                                        {Object.keys(this.state.loadedPersonalQueries).length > 0 && (<div>{savedQueryCard('personal', this.state.totalPersonalResults, this.filterPersonalList, this.state.filteredPersonalEntries)}</div>)}
+                                                   </Spinner>
+                                                </Tab>
+                                           </Tabs>
+        };
+        if (!GlobalExtConstants.INVLIST.IS_ONAP){
+            return (<div>
+            <div className='static-modal'>
+                      		<Modal show={this.state.showDeleteModal} onHide={this.closeDeleteModal} dialogClassName="modal-override">
+                      		    <Spinner loading={this.state.enableDeleteBusyFeedback}>
+                      			    <Modal.Header>
+                      			    	<Modal.Title>Delete DSL Query</Modal.Title>
+                      			    </Modal.Header>
+                      			    <Modal.Body>
+                      			        <Alert id="deleteError" className={this.state.deleteErrMsg ? 'show' : 'hidden'} bsStyle="danger" onDismiss={() => this.setState({deleteErrMsg: false})}>
+                                            <h3>An error occurred</h3>
+                                            <p>
+                                              {this.state.deleteErrMsg}
+                                            </p>
+                                         </Alert>
+                                        <p>Are you sure you want to delete the following query?: {this.state.focusedEntryName}</p>
+                      			    </Modal.Body>
+                      			    <Modal.Footer>
+                                    	<Button onClick={this.closeDeleteModal}>Cancel</Button>
+                                    	<Button onClick={this.submitDelete}>Delete</Button>
+                                    </Modal.Footer>
+                                </Spinner>
+                      		</Modal>
+            </div>
+
+              <Row>
+                 <Col className={this.props.isSavedQueryFlow ? 'col-lg-10' : 'col-lg-12'}>
+                    <Alert id="deleteSuccess" bsStyle="success" className={this.state.deleteSuccessfulMsg ? 'show' : 'hidden'} onDismiss={() => this.setState({deleteSuccessfulMsg: false})}>
+                            <h3>Delete Successful</h3>
+                            <p>
+                              {this.state.deleteSuccessfulMsg}
+                            </p>
+                    </Alert>
+                    {!this.props.isSavedQueryFlow && (<Panel>
+                      <Panel.Heading>
+                        <Panel.Title toggle>
+                          <div className="checkbox">
+                             <h2>Saved Queries</h2>
+                          </div>
+                        </Panel.Title>
+                      </Panel.Heading>
+                      <Panel.Collapse>
+                        <Panel.Body className='cardwrap'>
+                            {savedQueryTabs()}
+                        </Panel.Body>
+                      </Panel.Collapse>
+                    </Panel>)}
+                    {this.props.isSavedQueryFlow && savedQueryTabs()}
+                  </Col>
+                 </Row>
+          </div>);
+        }else{
+            return (<span></span>);
+        }
+   }
+}
+
+export default CustomDSLSaveLoad;
diff --git a/src/app/byoq/CustomDsl.jsx b/src/app/byoq/CustomDsl.jsx
new file mode 100644
index 0000000..61650ba
--- /dev/null
+++ b/src/app/byoq/CustomDsl.jsx
@@ -0,0 +1,4710 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+import React, {Component} from 'react';
+import PanelGroup from 'react-bootstrap/lib/PanelGroup';
+import Panel from 'react-bootstrap/lib/Panel';
+import Modal from 'react-bootstrap/lib/Modal';
+import Grid from 'react-bootstrap/lib/Grid';
+import Button from 'react-bootstrap/lib/Button';
+import ModelGallery from 'app/model/modelSearch/components/ModelGallery.jsx';
+import Autosuggest from 'react-autosuggest';
+import DatePicker from 'react-datepicker';
+import moment from "moment";
+import DslHints from 'app/assets/configuration/dsl_hints.json';
+import DslDetailedHelp from 'app/assets/configuration/dsl_detailedHelp.json';
+import {ExportExcel} from 'utils/ExportExcel.js';
+import commonApi from 'utils/CommonAPIService.js';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+import {GeneralCommonFunctions} from 'utils/GeneralCommonFunctions.js';
+import Spinner from 'utils/SpinnerContainer.jsx';
+import OutputToggle from 'generic-components/OutputToggle.jsx';
+import Pagination from 'react-js-pagination';
+import Col from 'react-bootstrap/lib/Col';
+import Row from 'react-bootstrap/lib/Row';
+import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger';
+import Tooltip from 'react-bootstrap/lib/Tooltip';
+import OutputVisualization, {Visualization} from 'generic-components/OutputVisualization.jsx';
+import ModelCard from 'app/model/modelSearch/components/ModelCard.jsx';
+import CustomDSLSaveLoad from 'app/byoq/CustomDSLSaveLoad.jsx';
+import FormGroup from 'react-bootstrap/lib/FormGroup';
+import FormControl from 'react-bootstrap/lib/FormControl';
+import ControlLabel from 'react-bootstrap/lib/ControlLabel';
+import InfoToggle from 'generic-components/InfoToggle.jsx';
+import Alert from 'react-bootstrap/lib/Alert';
+import Tabs from 'react-bootstrap/lib/Tabs';
+import Tab from 'react-bootstrap/lib/Tab';
+import BootstrapTable from 'react-bootstrap-table-next';
+import filterFactory, {textFilter,customFilter} from 'react-bootstrap-table2-filter';
+import FilterTypes from 'generic-components/filter/components/FilterTypes.jsx';
+import DownloadRangeModel from 'generic-components/DownloadRangeModel.jsx';
+import SelectFilter from 'generic-components/filter/components/SelectFilter.jsx';
+import Toggle from 'react-toggle';
+import "react-toggle/style.css";
+import BootstrapSwitchButton from 'bootstrap-switch-button-react';
+
+let PAGINATION_CONSTANT = GlobalExtConstants.PAGINATION_CONSTANT;
+let EDGERULES = GlobalExtConstants.EDGERULES;
+let OXM = GlobalExtConstants.OXM;
+let INVLIST = GlobalExtConstants.INVLIST;
+let generateExcels = ExportExcel.generateExcels;
+let DOWNLOAD_ALL = GlobalExtConstants.DOWNLOAD_ALL;
+let DOWNLOAD_TOOLTIP = GlobalExtConstants.DOWNLOAD_TOOLTIP;
+let filterTypeList = GlobalExtConstants.FILTER_TYPES;
+let TABULAR_FILTER_TYPE = GlobalExtConstants.TABULAR_FILTER_TYPE;
+let ENVIRONMENT = GlobalExtConstants.ENVIRONMENT;
+let EMAIL_EXT = GlobalExtConstants.EMAIL_EXT;
+let APERTURE_SERVICE = JSON.parse(sessionStorage.getItem(ENVIRONMENT + 'APERTURE_SERVICE'));
+let buildAttrList = ExportExcel.buildAttrList;
+
+let dslHints = null;
+let nodeTypes = [];
+let properties = null;
+let traverseRulesDsl = [];
+let inputValue = '';
+let testData = null;
+
+var settings = {
+	'NODESERVER': INVLIST.NODESERVER,
+	'PROXY': INVLIST.PROXY,
+  	'PREFIX': INVLIST.PREFIX,
+  	'VERSION': INVLIST.VERSION,
+	'USESTUBS': INVLIST.useStubs,
+	'APERTURE': INVLIST.APERTURE,
+	'TABULAR': INVLIST.TABULAR,
+	'TABULARVERSION': INVLIST.TABULARVERSION
+};
+class AttributeFilter extends Component {
+  
+	constructor(props) {
+	  super(props);	  	  
+	  this.filter = this.filter.bind(this);
+	  this.getValue = this.getValue.bind(this);
+	  this.props = props;
+	  this.state = {
+		filterText: '',
+		isPageChange: this.props.isPageChange,
+		columnValue : ''
+	  };
+	}
+	getValue = () => {
+	  return this.input.value;
+	}
+	setPlaceHolder = () => {
+	  let filterText = '';
+	  filterText = 'Enter ' + this.props.column.text;
+	  return filterText;
+	}
+	filter = () => {
+	  let txt=this.props.column.text;
+	  let obj = {};
+	  obj[txt] = this.getValue();
+	  var columnFilter = this.props.columnFilter; 
+	 for(var i=0;i<columnFilter.length;i++){
+		if(columnFilter[i][txt] != undefined){
+		  columnFilter[i][txt] = this.getValue();
+		  this.props.handleOnFilter(columnFilter,this.getValue());
+		  this.props.onFilter(this.getValue());
+		}
+	  }
+	}
+	render() {
+	  return (
+		<div>
+		  
+			<input
+			key="input"
+			ref={ node => this.input = node }
+			type="text"
+			  placeholder={this.setPlaceHolder()}
+			  onChange={this.filter}
+			/>
+		  
+		</div>
+	  )
+	}
+  }
+  
+class CustomDsl extends Component {
+	nodeResults = '';
+	typeOfCall = true;
+	downloadTooltip = DOWNLOAD_TOOLTIP;
+	downloadAllTooltip = 'Downloads First ' + DOWNLOAD_ALL + ' Results';
+	downloadRangeTooltip= 'Download Results By Custom Range Selection';
+	downloadBulkTooltip= 'Download Results Of All Loaded Queries';
+	historyStackString = '';
+	dslObject={};
+	dslObjectList=[];
+	nodeTypeArray=[];
+	nodeTypeArrayList=[];
+	edgesArray=[];
+	relationsArray=[];
+	tempDslQuery='';
+	tempDslQueryList=[];
+	templateError=[];
+	templateErrorList={};
+	baseState='';
+	propertiesDsl = [];
+	tableFilterAliasColumns={};
+	constructor(props) {
+		console.log('CustomDsl:Constuctor props>>>>',props);
+		super(props);
+		APERTURE_SERVICE=JSON.parse(sessionStorage.getItem(ENVIRONMENT + 'APERTURE_SERVICE'));
+    console.log('APERTURE_SERVICE: ' + APERTURE_SERVICE);
+			TABULAR_FILTER_TYPE=(APERTURE_SERVICE && JSON.parse(sessionStorage.getItem(ENVIRONMENT + 'ENABLE_ANALYSIS')))?'CONTAINS':'=';
+	    this.saveLoadComponent = React.createRef();
+		this.saveLoadComponentDsl = React.createRef();
+		this.state = {
+			nodeTypes: [],
+			hintHtml: {},
+			header: null,
+			multipleNodes: '',
+			isLoading: false,
+			nodes: [],
+			simpleQueries: [],
+			traversalQueries: [],
+			unionQueries: [],
+			negationQueries: [],
+			topologyQueries: [],
+			limitQueries: [],
+      advancedQueries: [],
+			showModal: false,
+			query: '',
+			value: '',
+			valuePreviousState: '',
+			suggestions: [],
+			edgeRules: [],
+			previousNodeTypeDsl: '',
+			selected: [],
+			nodeTypeDsl: '',
+			model: null,
+			showPagination: false,
+			showResults: false,
+			activePage: 1,
+			aggregateActivePage: 1,
+			totalResults: 0,
+			errorResults: false,
+			errorMessage: '',
+			noResults: true,
+			validInput: false,
+			isInitialLoad: true,
+			prevQuery : '',
+			showHistoryModal:false,
+			startDate: moment(),
+            res: null,
+            visualAddition: false,
+            nodeDisplay: '',
+            showNodeModal: false,
+            focusedNode: {},
+	    	historyType: 'dsl',
+      		focusedNodeUri: 0,
+			viewName: localStorage.getItem(GlobalExtConstants.ENVIRONMENT + '_' + sessionStorage.getItem(GlobalExtConstants.ENVIRONMENT + 'userId') + '_viewPreference')  || 'CardLayout',
+			focusedNodeType: '',
+			historyParams: '' , 
+			showModelOptions:false,
+			enableCalendar: true,
+			resetColumnFilters: true,
+			isPageNumberChange: false,
+			loadedQueries: [],
+			queryDescription: '',
+			queryName: '',			
+			category:'',
+			saveSuccessfulMsg: false,
+			saveErrorMsg: false,
+			enableSaveBusyFeedback: false,
+			isAggregate: false,
+			isAggregatePreviousState: false,
+			isAggregateChecked: false,
+			isCommunitySharedPreviousState: false,
+			isCommunitySharedChecked: false,
+			associatedNodesEnabled: false,
+			associatedNodesEnabledPreviuosState: false,
+			aggregatePaths: [],
+			aggregatePathAttrs: [],
+			aggregateParentGroup: [],
+			aggregateObjects: [],
+			tabularAggregateColumns: [],
+			tabularAggregateData: [],
+			aggregateAttrList: [],
+			aggregateNodes: [],
+			allAggregateNodes: [],
+			allres: null,
+			allAggregatePaths: [],
+			allAggregatePathAttrs: [],
+			allAggregateObjects: [],
+			allAggregateParentGroup: [],
+			allTabularAggregateColumns: [],
+			allTabularAggregateData: [],
+			allAggregateAttrList: [],
+			reRender: false,
+			columnFilter: [],
+			filterTemplateEntries: [],
+			filterTemplateHeader: [],
+			filterTemplateError: false,
+			filterTemplateEntriesList:[],
+	  		filterTemplateHeaderList:[],
+			filterTemplateErrorList:[],
+			nodeTypeOfDslTemplateList:[],
+			valueList:[],
+			templateQueryList:[],
+            editModel: {},
+            showEditModal: false,
+            templateQuery: '',
+            isDSLFlow: props.viewName === 'BYOQ',
+			isSavedQueryFlow: props.viewName === 'Saved Queries',
+			filterTypeDisplay: {'default':'Filter Type'},
+			filterTypeDisplayList: [],
+			disableFilter: true,
+			totalPages: 0,
+			pageRange: 1,
+			showDownloadResultsModal: false,
+			errorDownloadResults:false,
+			downloadErrorMsg: '',      
+			enableModelBusyFeedback:false,
+			downloadCount:DOWNLOAD_ALL,
+			addAndTemplateState:false,
+			nodeTypeOfDslTemplate:[],
+			filterDisplay:'Select Property',
+			queryId:'',
+			queryNameList: [],
+			queryDescriptionList: [],
+			categoryList: [],
+			isPublicCheckedList: [],
+			isCommunitySharedList: [],
+			queryIdList: [],
+			isAggregateCheckedList:[],
+			associatedNodesEnabledList: [],
+			associatedNodesEnabledPreviuosStateList: [],
+			enableTreeLoadBusyFeedback: false,
+            treeLoadErrMsg: null,
+			isDataSteward: sessionStorage.getItem(ENVIRONMENT + 'roles') && sessionStorage.getItem(ENVIRONMENT + 'roles').indexOf('data_steward_ui_view') > -1,
+			isPublicChecked: sessionStorage.getItem(ENVIRONMENT + 'roles') && sessionStorage.getItem(ENVIRONMENT + 'roles').indexOf('data_steward_ui_view') > -1,
+			defaultViewName: localStorage.getItem(GlobalExtConstants.ENVIRONMENT + '_' + sessionStorage.getItem(GlobalExtConstants.ENVIRONMENT + 'userId') + '_viewPreference')  || 'CardLayout',
+      		isTypeahead: true,
+			enableRealTime: JSON.parse(sessionStorage.getItem(ENVIRONMENT + 'ENABLE_ANALYSIS')),
+			downloadTemplateStatus:false,
+			failedDownloadedTemplate:[],
+			failedDownloadedTemplateMsg:'',
+			failedEmailTemplateMsg:'',
+			isMergedTabsChecked:false,
+			isGenerateEmailChecked: false,
+			emailTriggerMsg:'',
+			dslConfigArray: [],
+			staticTemplateFilters: [],
+            staticTemplateFiltersList: [],
+	    tableAggregateAliasColumns:{}
+		}
+	}
+  componentWillMount = () => {
+    console.log('CustomDsl:componentWillMount',JSON.stringify(this.props));
+	if(!this.props.location.historyStackString){
+		this.props.location.historyStackString = this.props.location.pathname + ',,Origin||';
+	}else{
+		this.historyStackString = this.props.location.historyStackString;
+	}
+	dslHints = Object.values(DslHints);
+	this.setState( {hintHtml: dslHints});
+	this.processHelp( DslDetailedHelp );
+	console.log('how many nodes? ' + this.state.nodes.length);
+	this.processEdgeRules(EDGERULES);
+	nodeTypes = this.buildNodeList();		
+	this.setState({
+		nodeTypes: nodeTypes},
+		function () {
+			console.log('nodeTypes: ' + this.state.nodeTypes.length) ;
+			this.baseState=this.state;
+			this.buildDynamicByoq('','','init');
+		}
+	);	
+		
+ }
+ buildDynamicByoq=(queryParam, makeCall, loadType)=> {
+    let query = '';
+    let shouldRun = makeCall;
+    if(queryParam){
+       query = queryParam;
+    }else if(this.props.match.params.type === 'built' || this.props.match.params.type === 'built-aggregate'){
+       query = atob(this.props.match.params.propId).replace('<pre>','').replace('</pre>','');
+       shouldRun = true;
+    }else{
+        shouldRun = true;
+		let nodeType =  (this.props.match.params.type) ? this.props.match.params.type : '';
+		let propIds = (this.props.match.params.propId) ? this.props.match.params.propId.split(';') : '';
+		let propertyValue = '';
+		for(var i  in propIds){
+			let propValue = propIds[i].split(':');
+			console.log(propValue[0] + '....' + propValue[1]);
+			let atobPropValue = atob(propValue[1]).replace('<pre>','').replace('</pre>','');
+			if(propertyValue == ''){
+				propertyValue ='(\'' + propValue[0] +'\',\''+ atobPropValue + '\')';
+			}else{
+				propertyValue = propertyValue + '(\'' + propValue[0] +'\',\''+ atobPropValue + '\')';
+			}			
+		}
+		console.log('propertyValue>>>>>',propertyValue);
+	    let relArray = (this.props.match.params.relArray) ? this.props.match.params.relArray.split('&') : '';
+	    let relativeStr = '';
+	    let str = '';
+	    if(relArray.length>0){
+	    	for(var n in relArray){
+	    		relativeStr = relativeStr + relArray[n] + '*'
+	    	}
+	    	str = relativeStr.replace(/\*/g, '*,').slice(0, -1);
+	    }
+	    let relativeAttachStr = (str === '') ? '' : '>[' + str + ']';
+	    //encPropValue = (nodeType === '') ? '': atob(propValue[1]);
+		query = (nodeType === '') ? '' : nodeType + '*' + propertyValue + relativeAttachStr;
+		if(loadType ==='init'){
+			console.log('this.baseState>>>>>',this.baseState)
+			this.baseState.value=query;
+		}		
+	}
+	console.log('query>>>',query);
+	console.log('this.props.match.params.type>>>',this.props.match.params.type);
+	if(query != ''){
+		this.nodeResults = '';
+		this.typeOfCall = true;
+		let isInitialLoad = this.state.isInitialLoad;
+		this.setState( {value: query,validInput: true,isInitialLoad: false},() => { if(shouldRun){this.formQueryString(false, isInitialLoad,false)}});
+	} 
+}
+  getNodeTypes = () =>{
+    var result = JSON.parse(OXM);
+    var arrayOfTypes = result['xml-bindings']['java-types'][0]['java-type'];
+    var nodeTypeArray = [];
+    for(var j = 0; j < arrayOfTypes.length; j++){
+        if(arrayOfTypes[j]['xml-root-element'] && arrayOfTypes[j]['xml-root-element'][0]
+            && arrayOfTypes[j]['xml-root-element'][0]['$'] && arrayOfTypes[j]['xml-root-element'][0]['$']['name']){
+            nodeTypeArray.push((arrayOfTypes[j]['xml-root-element'][0]['$']['name']).toLowerCase());
+        }
+    }
+    return nodeTypeArray;
+  }
+
+  getNodeTypeFromURI = (uri) => {
+    var nodeTypeArray = this.getNodeTypes();
+    var tokenizedUri = uri.split("/");
+    var nodeType = "";
+    var found = false;
+    for (var i = tokenizedUri.length - 1; i >= 0 && !found; i--){
+        if(nodeTypeArray.indexOf(tokenizedUri[i]) > -1){
+            nodeType = tokenizedUri[i];
+            found = true;
+        }
+    }
+    return nodeType;
+  }
+
+  getAttributesFromNodeType = (nt) => {
+    var result = JSON.parse(OXM);
+    var arrayOfTypes = result['xml-bindings']['java-types'][0]['java-type'];
+    var foundIndex = -1;
+    var attributesArray = [];
+    var nodeType = nt.replace(/-/g,'');
+  	for (var i = 0; i < arrayOfTypes.length && foundIndex === -1; i++) {
+  		if(arrayOfTypes[i]['$'] && arrayOfTypes[i]['$']['name'] && arrayOfTypes[i]['$']['name'].toLowerCase() === nodeType){
+  		    foundIndex = i;
+  		}
+  	}
+    for (var j = 0; j < arrayOfTypes[foundIndex]['java-attributes'][0]['xml-element'].length; j++) {
+    	let property =  arrayOfTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['$']['name'];
+    	let type = arrayOfTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['$']['type'];
+    	if (type === 'java.lang.String' || type === 'java.lang.Boolean') {
+    	    attributesArray.push(property);
+    	}
+    }
+    return attributesArray;
+  }
+ 
+  getAttributesFromPath = (path,tableAggregateAliasColumns) => {
+     var nodeParseArray = path.split('>');
+    console.log(nodeParseArray);
+    var attributeArray = [];
+    var aggregatePaths = this.state.aggregatePathAttrs;
+    if(!this.typeOfCall){
+        aggregatePaths = this.state.allAggregatePathAttrs;
+    }
+    for(var i = 0; i < nodeParseArray.length; i++){
+		var nodeKey = nodeParseArray[i].trim();	
+		let tableColumnsBuilt = ExportExcel.buildAttrList(nodeKey,[],'required');
+        for(var j = 0; j <  aggregatePaths[nodeKey].length; j++){
+			let desc=tableColumnsBuilt.map((a) => 
+			{
+				if(a.value.toLowerCase()==aggregatePaths[nodeKey][j].toLowerCase())
+				  return a.description;
+				else
+				  return '';
+			}).filter(function (el) {
+				return el != '';
+			});
+			if(desc.length===0){
+				desc.push('');
+			}
+			if(Object.keys(tableAggregateAliasColumns).length !== 0 && tableAggregateAliasColumns[nodeKey] && tableAggregateAliasColumns[nodeKey][0][aggregatePaths[nodeKey][j]]){
+				attributeArray.push(nodeKey + '|' + tableAggregateAliasColumns[nodeKey][0][aggregatePaths[nodeKey][j]] +'|'+ desc[0]);
+			}else{
+				attributeArray.push(nodeKey + '|' + aggregatePaths[nodeKey][j] + '|' + desc[0]);
+			}
+        }
+    }
+    return attributeArray;
+  }
+
+  buildNodeList = () => {
+		var result = JSON.parse(OXM);
+		var arrayOfTypes = result['xml-bindings']['java-types'][0]['java-type'];
+		let nodeList = [];
+
+		for (var i = 0; i < arrayOfTypes.length; i++) {
+			var hasProperties = false;
+			if (arrayOfTypes[i]['java-attributes']) {
+			    let elementLength = 0;
+			    if (arrayOfTypes[i]['java-attributes'][0]['xml-element']) {
+			    	elementLength = arrayOfTypes[i]['java-attributes'][0]['xml-element'].length;
+			    }
+			    for (var j = 0; j < elementLength; j++) {
+			    	let property = JSON.stringify(arrayOfTypes[i]['java-attributes'][0]['xml-element'][j]['xml-properties']);
+			    	if (property) { //add to the list
+			    	hasProperties = true;
+			    	}
+			    }
+			    if (hasProperties) {
+			    	let node = arrayOfTypes[i]['xml-root-element'][0]['$']['name'];
+			    	nodeList.push(node);
+			    }
+			}
+		}
+		nodeList.sort();
+		return nodeList;
+  }
+
+  processHelp(data) {
+		//console.log('Data' + JSON.stringify(data));
+		this.setState( {simpleQueries: data.simple } );
+		console.log('Value' + JSON.stringify(this.state.simpleQueries));
+		this.setState( {traversalQueries: data.traversal} );
+		this.setState( {unionQueries: data.union} );
+		this.setState( {negationQueries: data.negation} );
+		this.setState( {topologyQueries: data.topology} );
+		this.setState( {limitQueries: data.limit} );
+    this.setState( {advancedQueries: data.advanced} );
+  }
+
+  processEdgeRules = (data) => {
+		var ruleArr = [];
+		this.setState({
+			edgeRules: data.rules
+		});
+		ruleArr = data.rules;
+		// console.log("Rule"+JSON.stringify(ruleArr));
+		// new = data.Rules;
+  }
+
+  hint = () => { // open modal
+    console.log('hint >> showModal');
+    this.setState({
+		  showModal:true
+    });
+    this.hints = this.state.html;
+  }
+
+  onAddItem = (event) => {
+	  event.preventDefault();
+	  GeneralCommonFunctions.scrollTo("outputBlock");
+      this.nodeResults = '';
+      this.typeOfCall = true;
+      this.setState({ viewName: this.state.defaultViewName, aggregateActivePage: 1, activePage: 1, nodes: [], aggregateNodes: [],errorResults:false},function () { this.formQueryString(false,false,false); }.bind(this));
+  };
+
+  formQueryString = (bypassCall, isInitialLoad, aggregateForGraph) =>{
+		console.log('formQueryString>>>>>>this.state.value :',this.state.value);
+		var DSLQuery = this.state.value;
+		DSLQuery.trim();
+		console.log('DSLQuery.trim().length: ' + DSLQuery.trim().length);
+		let resp = '';
+		if (DSLQuery.trim() !== '' || (this.props.match.params.type && DSLQuery.trim() !== '')){
+			console.log('validInput.DSLQuery: ' + DSLQuery);
+			this.setState({
+			    validInput: true,isInitialLoad: isInitialLoad
+			});
+			const payload = {dsl: DSLQuery};
+			let format = 'simple';
+			if((this.state.isAggregateChecked || (isInitialLoad && this.props.match.params.type === 'built-aggregate')) && !aggregateForGraph){
+			    format = 'aggregate';
+			    this.setState({isAggregateChecked: true});
+			}
+			let queryStr = '';
+			if(this.typeOfCall){
+			    if(format === 'aggregate' || aggregateForGraph){
+			        this.setState({isAggregate: true});
+			        queryStr = 'dsl?format=' + format + '&resultIndex=' + this.state.aggregateActivePage + '&resultSize=' + PAGINATION_CONSTANT.RESULTS_PER_PAGE;
+			    }else{
+			        this.setState({isAggregate: false});
+			        queryStr = 'dsl?format=' + format + '&resultIndex='
+                			                + this.state.activePage + '&resultSize=' + PAGINATION_CONSTANT.RESULTS_PER_PAGE;
+			    }
+			}else{
+				let pagerange=this.state.pageRange.toString();
+				pagerange=pagerange.split('-');
+				if(pagerange.length > 1){
+					queryStr = 'dsl?format=' + format + '&resultIndex='+ parseInt(pagerange[0]) +'&resultSize=' + PAGINATION_CONSTANT.RESULTS_PER_PAGE + '&resultRangeEnd=' + parseInt(pagerange[1]);
+				}else{					
+					queryStr = 'dsl?format=' + format + '&resultIndex='+ 1 +'&resultSize=' + parseInt(pagerange);
+				} 
+				
+			}
+			const path = queryStr;
+			this.state.header = DSLQuery;
+			console.log('DSLQuery: ' + DSLQuery);
+			console.log('payload: ' + JSON.stringify(payload));
+			console.log('path: ' + path);
+			if(aggregateForGraph){
+			     this.setState({isLoading: true, prevQuery:DSLQuery});
+			} else if(this.typeOfCall){
+					if(this.state.prevQuery !== DSLQuery){
+			            this.setState({isLoading: true,
+			            	totalResults: 0,
+			            	prevQuery:DSLQuery
+			            });
+					}else{
+			            this.setState({isLoading: true, nodes: [], aggregateNodes: [], prevQuery:DSLQuery});
+			        }
+			}
+			if(!bypassCall){
+				resp = this.getNodes(settings, path, payload, aggregateForGraph);
+			}
+		}else { // write a msg
+			console.log('validInput: ' + false);
+			this.setState({
+				validInput: false,
+				isInitialLoad: isInitialLoad
+			});
+			GeneralCommonFunctions.scrollTo('dslInputError');
+		}
+		console.log('Response: ' + resp);
+  }
+
+  onSuggestionSelected = (event, { suggestion }) => {
+		event.preventDefault();
+
+		let item = suggestion;
+		console.log('onSuggestionSelected.item: ' + item);
+		console.log('onSuggestionSelected.inputValue: ' + inputValue);
+
+		this.setState({
+			selected: [...this.state.selected, item],
+				value: inputValue + item
+			},
+			function () {
+			console.log('onSuggestionSelected.selected: ' + this.state.selected);
+			console.log('onSuggestionSelected.value: ' + this.state.value);
+		});
+		//if (!item.includes('(')) {
+	  if (item.indexOf('(') === -1) { // not found
+			this.setState({previousNodeTypeDsl: item},
+				function () {
+					this.setState({
+					nodeTypeDsl: item
+					});
+					console.log('onSuggestionSelected.previousNodeTypeDsl: ' + this.state.previousNodeTypeDsl);
+					console.log('onSuggestionSelected.nodeTypeDsl: ' + this.state.nodeTypeDsl);
+				}
+			);
+		}
+  }
+
+  storeInputReference = autosuggest => {
+		if (autosuggest !== null) {
+			this.input = autosuggest.input;
+		}
+  };
+
+  clear = () => {
+		this.setState({
+			value: '',
+			previousNodeTypeDsl: '',
+            header: ''
+		});
+  }
+
+  openSaveModal = () =>{
+        this.setState({
+        	showSaveModal: true,
+        	saveSuccessfulMsg: false,
+        	treeLoadErrMsg: false,
+        	isPublicChecked:this.state.isDataSteward,
+        	isCommunitySharedChecked: false,
+            isEditModal:false,
+            enableTreeLoadBusyFeedback: true,
+            dslConfigurableFiltersArray: []
+        });
+        this.getTreeFromDSL(this.state.value).then(tree => {
+             this.setState({enableTreeLoadBusyFeedback: false, dslConfigArray: this.getConfigArrayFromDSLTree(tree, [], [])});
+        });
+  };
+
+  handleTypeaheadChange = (event) =>{
+    this.setState({isTypeahead: event.target.checked});
+  }
+
+  closeSaveModal = () =>{
+  	//Set previous loaded state
+	  if(this.state.isEditModal){
+		  this.setState({
+			  value: this.state.valuePreviousState,
+			  isAggregateChecked: this.state.isAggregateCheckedPreviousState,
+			  isCommunitySharedChecked: this.state.isCommunitySharedCheckedPreviousState,
+			  associatedNodesEnabled: this.state.associatedNodesEnabledPreviousState,
+			  enableTreeLoadBusyFeedback: false
+		  });
+	  }
+
+	  this.setState({
+		  showSaveModal: false,
+		  queryDescription: '',
+		  queryName: '',		  
+		  category:'',
+		  enableSaveBusyFeedback: false,
+		  showQueryExistsWarning: false,
+		  saveFailureMsg: false,
+		  isEditModal:false
+	  });
+  };
+
+  submitSave = (bypassDupeCheck) =>{
+	let existQueryName=false;
+	let queryId='';
+	Object.keys(this.state.loadedQueries).map((key) =>{
+		if(this.state.loadedQueries[key].name === this.state.queryName){
+			existQueryName=true;
+			if(this.state.showQueryExistsWarning){
+				queryId=key;
+			}			
+		}
+	});
+    if(!bypassDupeCheck && existQueryName){
+        this.setState({showQueryExistsWarning:true});
+    }else{
+        var aggregateString = "false";
+        if(this.state.isAggregateChecked){
+            aggregateString = "true";
+		}
+		var queryParam=(this.state.queryId==='')?queryId:this.state.queryId;
+        var body =  {
+                      "cols": [
+                          {
+                              "name": "query_name",
+                              "value": this.state.queryName
+                          },
+                          {
+                              "name": "creator",
+                              "value": sessionStorage.getItem(ENVIRONMENT + 'userId')
+                          },
+                          {
+                              "name": "description",
+                              "value": this.state.queryDescription
+                          },
+                          {
+                              "name": "is_aggregate",
+                              "value": aggregateString
+                          },
+                          {
+                              "name": "community_shared",
+                              "value": "" + this.state.isCommunitySharedChecked
+                          },
+                          {
+                              "name": "is_public",
+                              "value": "" + this.state.isPublicChecked
+                          },
+                          {
+                              "name": "template_details",
+                              "value": JSON.stringify(this.state.staticTemplateFilters)
+                          },
+                          {
+                              "name": "dsl",
+                              "value": btoa('<pre>' + this.state.value + '</pre>')
+						  }						  
+                      ]
+		}
+		if(this.state.category && this.state.category !=''){
+			let catObj={"name": "category","value": this.state.category}
+			body['cols'].push(catObj);
+		}
+		let localVersion='';
+		if(this.state.showQueryExistsWarning){
+			if(bypassDupeCheck && this.state.loadedQueries[queryParam] && this.state.loadedQueries[queryParam].version ){
+				localVersion = this.state.loadedQueries[queryParam].version;;
+				body.version = localVersion;
+
+			}
+		}else{
+			if(bypassDupeCheck && this.state.loadedQueries[this.state.queryId] && this.state.loadedQueries[this.state.queryId].version ){
+				localVersion = this.state.loadedQueries[this.state.queryId].version;;
+				body.version = localVersion;
+			}
+		}
+        
+		this.setState({showQueryExistsWarning:false, enableSaveBusyFeedback:true});
+		settings['ISTABULAR'] = true;
+		let localQuery='queries';
+		let localHeader=null; 
+		if(queryParam !==''){
+			localQuery += '/'+encodeURIComponent(queryParam);
+			localHeader= [{
+				"name":"If-Match",
+				"value": localVersion
+			 }];
+		}
+		commonApi(settings, localQuery, 'PUT', body, 'BYOQSaveInfo', GlobalExtConstants.OVERRIDE_DOMAIN,null,localHeader)
+               		.then(res => {
+               			console.log('res:' + res.data);
+               			if(res.status === 201){
+               			    if(res.data.status && (res.data.status !== 200 && res.data.status !== 201)){
+               			        this.triggerSaveError(res.data);
+               			    }else{
+								if(this.state.isEditModal && this.state.isDSLFlow){
+									this.setState({
+										value: this.state.valuePreviousState,
+										isAggregateChecked: this.state.isAggregateCheckedPreviousState,
+										isCommunitySharedChecked: this.state.isCommunitySharedCheckedPreviousState,
+										associatedNodesEnabled: this.state.associatedNodesEnabledPreviousState,
+									});
+								}
+
+								let jumpToId = "saveSuccess";
+								if (this.state.isSavedQueryFlow && this.state.isEditModal){
+									jumpToId = "saveSuccessEdit";
+								}
+								else if(this.state.isSavedQueryFlow && !this.state.isEditModal){
+									jumpToId = "saveSuccessTemplate";
+								}
+
+								this.setState({
+									saveSuccessfulMsg: "The following query was successfully saved: " + this.state.queryName,
+									showSaveModal: false,
+									enableSaveBusyFeedback:false,
+								});
+
+								GeneralCommonFunctions.scrollTo(jumpToId);
+								if(this.state.isSavedQueryFlow){
+									this.saveLoadComponent.current.getQueries();
+								}else {
+									this.saveLoadComponentDsl.current.getQueries();
+								}
+                               }
+                           }else{
+                             this.triggerSaveError(res.data);
+                           }
+               		}, error=>{
+               		    this.triggerSaveError(error.response.data);
+               		}).catch(error => {
+               		    this.triggerSaveError(error);
+        });
+    }
+  };
+
+  triggerSaveError = (error) => {
+      console.error('[CustomDsl.jsx] error : ', JSON.stringify(error));
+    	let errMsg = '';
+    	if(error.status && error.message){
+    	    errMsg += "Error Occurred: " + error.status + ' - ' +error.message;
+    	}else{
+    	    errMsg += "Error Occurred: " + JSON.stringify(error);
+    	}
+    	console.log(errMsg);
+        this.setState({saveFailureMsg: errMsg + " - Failed to save query : " + this.state.queryName, enableSaveBusyFeedback:false});
+        GeneralCommonFunctions.scrollTo("saveFailure");
+    }
+
+  handleQueryDescriptionChange =  (e) => {
+     this.setState({queryDescription: e.target.value});
+  };
+  handleQueryNameChange = (e) => {
+     this.setState({queryName: e.target.value});
+  };
+  handleQueryChange = (e) => {
+  	this.setState({value: e.target.value});
+  };
+  handleCategoryChange = (e) =>{
+	this.setState({category: e.target.value});
+  };
+
+  setQueriesState = (savedQueries) =>{
+    this.setState({
+    	loadedQueries: savedQueries
+    });
+  };
+
+  getNodes(settings, path, payload, graphCall) {
+		this.setState({isLoading: true});
+		settings['ISTABULAR'] = false;
+		if(this.state.enableRealTime && APERTURE_SERVICE){
+			settings['ISAPERTURE'] = this.state.enableRealTime;
+		}else{
+			Object.keys(settings).forEach((key)=>{
+				if(key==='ISAPERTURE'){
+					delete settings[key];
+				}
+			})
+		}
+		console.dir('CustomDSL:settings:' + JSON.stringify(settings));
+		console.log('CustomDSL:path:' + path);
+		console.dir('CustomDSL:payload:' + JSON.stringify(payload));
+		commonApi(settings, path, 'PUT', payload, 'BYOQDefault', null, null, [{
+                                                                                "name":"X-DslApiVersion",
+                                                                                "value": "V2"
+                                                                              }])
+		.then(res => {
+			console.log('CustomDSL: Response',Object.keys(res.data));
+				if(!graphCall && this.typeOfCall){
+					this.setState({aggregatePaths: [],
+								aggregateParentGroup: [],
+								aggregateObjects: []});
+				}
+				if(this.state.isAggregate){
+					if(graphCall){
+						if(res.data.results.length > 0 && this.state.visualAddition){
+							Visualization.chart('currentStateAggregate', [], [], res.data, this);
+							this.setState({isLoading: false, nodes: res.data.results, res: res});
+						}
+					}else{
+						this.processAggregateData(res);
+					}
+				}else{
+					this.processData(res);
+					if(this.state.nodes.length > 0 && this.state.visualAddition){
+						Visualization.chart('currentState', [], [], this.state.res.data, this);
+					}
+				}
+			}, error=>{
+				if(this.typeOfCall){
+					this.triggerError(error);
+				}else{
+					let errMsg = this.renderErrorMsg(error);
+					this.setState({ isLoading: false,errorDownloadResults:true,downloadErrorMsg:errMsg,enableModelBusyFeedback:false});       
+     				}				
+			}).catch(error => {
+				if(this.typeOfCall){
+					this.triggerError(error);
+				}else{
+					let errMsg = this.renderErrorMsg(error);
+					this.setState({ isLoading: false,errorDownloadResults:true,downloadErrorMsg:errMsg,enableModelBusyFeedback:false});       
+     			}
+	  });
+		//this.input.focus();
+  }
+
+  triggerError = (error) => {
+    console.error('[CustomDsl.jsx] triggerError error : ', JSON.stringify(error));
+  	//this.processData('');
+  	this.setState({isLoading: false,
+  		totalResults: 0,
+		showPagination: false,
+		showResults: false,
+		isInitialLoad: false,
+		noResults: true,
+		errorResults: true			  
+  	  });
+  	this.downloadAllTooltip = 'Downloads First ' + DOWNLOAD_ALL + ' Results';
+	let errMsg = this.renderErrorMsg(error);
+	this.setState({errorMessage:errMsg});
+	console.log(error.config);
+	this.input.focus();
+  }
+  renderErrorMsg = (error) =>{
+	let errMsg='';
+  	if (error.response) {
+  		// The request was made and the server responded with a status code
+  		// that falls out of the range of 2xx
+  		console.log('[CustomDsl.jsx] error :', error.response);
+  		if(error.response.status){
+  		    errMsg += " Code: " + error.response.status;
+  		}
+  		if(error.response.data){
+            errMsg += " - " + JSON.stringify(error.response.data);
+        }
+  	} else if (error.request) {
+  		// The request was made but no response was received
+  		// `error.request` is an instance of XMLHttpRequest in the browser and an instance of
+  		// http.ClientRequest in node.js
+  		console.log(error.request);
+  		errMsg += " - Request was made but no response received";
+  	} else {
+  		// Something happened in setting up the request that triggered an Error
+  		console.log('Error', error.message);
+  		errMsg += " - Unknown error occurred " + error.message;
+  	}
+   return errMsg;
+  }
+  formAliasFilterPropertes = ()  =>{
+	let tableAggregateAliasColumns={};
+	this.tableFilterAliasColumns={};
+	let dslQuery = this.state.value;
+	var limitPattern = /limit[\s]\d+|limit\d+/ig
+	var limitkey = dslQuery.match(limitPattern);
+	if(limitkey){
+		dslQuery = dslQuery.replace(limitkey[limitkey.length-1],'').trim();
+	}
+	dslQuery = this.alterDslQueryByRemoveSpaces(dslQuery);
+	//New adding
+	this.dslObject={};
+	this.nodeTypeArray=[];
+	//create placeholders for NodeTypes with Propand Propvalues
+	this.tempDslQuery=this.formTempDslQuery(dslQuery);
+	//Preparing Json Object to render into Placeholder		
+	this.contructDslNodes(dslQuery,'node',false,false,false,false);
+	;
+	let aliasRegex=/\'(\s)as(\s)\'|\'as\'/ig;
+	Object.keys(this.dslObject).map((nodekey)=>{
+		let nodeprops=this.dslObject[nodekey][0]['props'];
+		if(nodeprops){
+			let nodeTypeProp = nodeprops[0].slice(1,-1).split(',');
+			let objAlias = {};
+			let filterObjAlias={};
+			for(var s=0;s<nodeTypeProp.length;s++){
+				let nodeTypePropes=nodeTypeProp[s].match(aliasRegex);
+				let alias='';
+				let nprop='';
+				if(nodeTypePropes){
+					let nodeTypeSplit=nodeTypeProp[s].split(aliasRegex);
+					nprop=nodeTypeSplit[0].replace(/\'/g,'');                  
+					alias=nodeTypeSplit[nodeTypeSplit.length-1].replace(/\'/g,'');
+					objAlias[nprop]=alias;
+					filterObjAlias[alias]=nprop;
+				}
+			}
+			let nodeNo=parseInt(nodekey.substr(nodekey.length-2,nodekey.length-1).replace(/\-/g,''));
+			let keyact=isNaN(nodeNo);
+			let actKey=nodekey.split('-');
+			if(!keyact){
+				actKey.splice(actKey.length-1,1);
+				nodekey=actKey.join('-')+nodeNo;
+			}		
+			if(!tableAggregateAliasColumns[nodekey]){   
+				tableAggregateAliasColumns[nodekey]=[]; 
+				tableAggregateAliasColumns[nodekey].push(objAlias);      
+			
+			} 
+			if(!this.tableFilterAliasColumns[nodekey]){   
+				this.tableFilterAliasColumns[nodekey]=[]; 
+				this.tableFilterAliasColumns[nodekey].push(filterObjAlias);		  
+			}
+		}		
+	});
+	return tableAggregateAliasColumns;
+  }
+  processAggregateData = (resp) =>{
+        console.log('CustomDSL:processAggregateData Response data: ' + JSON.stringify(resp.data));
+	var downloadCount = DOWNLOAD_ALL;
+        var uniqueNodePaths = [];
+        var uniqueNodeAttributes = [];
+        var groupingByStart = [];
+		var aggregateObjectArray = [];
+		if (resp.data && resp.data.results) {
+			for(var i = 0; i < resp.data.results.length; i++){
+				var fullPath = "";
+				var nodePath = "";
+				var nodeTypesForPath = [];
+				var startNodeKey = "";
+				var aggregateObject = {};
+				//Make sure everything is in an array, so pushing single element into the array
+				if(!Array.isArray(resp.data.results[i])){
+					var tempObj = Object.assign({}, resp.data.results[i]);
+					resp.data.results[i] = [];
+					resp.data.results[i].push(tempObj);
+				}
+				for(var j = 0; j < resp.data.results[i].length; j++){
+					var objectIndex = 0;
+					for(var key in resp.data.results[i][j]){
+						var nodeType = this.getNodeTypeFromURI(key);
+						if (objectIndex === 0){
+							startNodeKey = key;
+						}
+						objectIndex++;
+						var nodeTypeLabel = '';
+						if(nodeTypesForPath[nodeType] >= 1){
+							nodeTypeLabel = nodeType + nodeTypesForPath[nodeType];
+							nodeTypesForPath[nodeType] = nodeTypesForPath[nodeType]++;
+						}else if (nodeTypesForPath[nodeType] === 0){
+							nodeTypeLabel = nodeType + 1;
+							nodeTypesForPath[nodeType] = 1;
+						}else{
+							nodeTypeLabel = nodeType;
+							nodeTypesForPath[nodeType] = 0;
+						}
+						if(!uniqueNodeAttributes[nodeTypeLabel]){
+						    uniqueNodeAttributes[nodeTypeLabel] = [];
+						}
+						for(var propKey in resp.data.results[i][j][key].properties){
+						    if(uniqueNodeAttributes[nodeTypeLabel].indexOf(propKey) === -1){
+						        uniqueNodeAttributes[nodeTypeLabel].push(propKey);
+						    }
+							Object.defineProperty(resp.data.results[i][j][key].properties, nodeTypeLabel + '|' + propKey, Object.getOwnPropertyDescriptor(resp.data.results[i][j][key].properties, propKey));
+							delete resp.data.results[i][j][key].properties[propKey];
+						}
+						fullPath += key + ' > ';
+						nodePath += nodeTypeLabel + ' > ';
+					}
+					aggregateObject = Object.assign({}, aggregateObject, resp.data.results[i][j][startNodeKey].properties);
+				}
+				nodePath =  nodePath.substring(0, nodePath.length - 3);
+				if(!aggregateObjectArray[nodePath]){
+					aggregateObjectArray[nodePath] = [];
+				}
+				aggregateObjectArray[nodePath].push(aggregateObject);
+				resp.data.results[i].fullPath = fullPath.substring(0, fullPath.length - 3);
+				resp.data.results[i].nodePath = nodePath;
+				if(!groupingByStart[startNodeKey]){
+					groupingByStart[startNodeKey] = [];
+					groupingByStart[startNodeKey].push(resp.data.results[i]);
+				}else{
+					groupingByStart[startNodeKey].push(resp.data.results[i]);
+				}
+				if(uniqueNodePaths.indexOf(resp.data.results[i].nodePath) === -1){
+					uniqueNodePaths.push(resp.data.results[i].nodePath);
+				}
+				console.log('Grouping by Start: ' + JSON.stringify(groupingByStart));
+				console.log('Unique Paths: ' + JSON.stringify(uniqueNodePaths));
+			}
+			if(this.typeOfCall){
+				let totalResults = (resp.headers) ? parseInt(resp.headers['total-results']) : 0;
+				console.log('totalResults>>>>>>>>>>>>>>>>>>>>>',totalResults);				
+				if(totalResults > DOWNLOAD_ALL){
+					this.downloadAllTooltip = DOWNLOAD_ALL + ' results out of '+ totalResults +' results will be downloaded, Please filter results further to obtain full report';
+				}else{
+					this.downloadAllTooltip = (totalResults === 1) ?'Downloads ' + totalResults + ' Results' : 'Downloads all ' + totalResults + ' Results' ;
+					downloadCount= totalResults;
+				}       
+				this.setState({
+					aggregateNodes: resp.data.results,
+					res: resp,
+					aggregatePaths: uniqueNodePaths,
+					aggregatePathAttrs: uniqueNodeAttributes,
+					aggregateObjects: aggregateObjectArray,
+					aggregateParentGroup: groupingByStart,
+					isLoading: false,
+					totalResults: totalResults,
+					showResults: totalResults > 0 ? true : false,
+					showPagination: totalResults > 0 ? true : false,
+					isInitialLoad: false,
+					noResults: totalResults > 0 ? false : true,
+					errorResults: false,
+					downloadCount: downloadCount,
+				},function(){this.formatAggregateIntoTabular();});
+				this.multipleNodes = this.state.aggregateNodes.length > 1;
+				//this.setState({ viewName: "CardLayout" }); commented not to defaulting to CardView 
+			}else{
+				console.log('else condition>>>>');			
+				if(resp.data && resp.data.results) {			
+					this.nodeResults = resp.data.results;
+					let totalResults = 0;
+					let totalPages = 0;
+					totalResults = parseInt(resp.headers['total-results']);
+					totalPages = parseInt(resp.headers['total-pages']);
+					this.setState({
+						allAggregateNodes: resp.data.results,
+						allres: resp,
+						allAggregatePathAttrs: uniqueNodeAttributes,
+						allAggregatePaths: uniqueNodePaths,
+						allAggregateObjects: aggregateObjectArray,
+						allAggregateParentGroup: groupingByStart,
+						totalPages:totalPages,
+						totalResults:totalResults,
+						errorDownloadResults:false,
+						downloadErrorMsg:''				
+					},function(){this.formatAggregateIntoTabular();});
+				}else{
+					this.downloadAllTooltip = 'Downloads First ' + DOWNLOAD_ALL + ' Results';
+				}
+				this.setState({isLoading: false});
+		  	}
+		}
+		GeneralCommonFunctions.scrollTo("outputBlock");
+  }
+
+  formatAggregateIntoTabular = () =>{
+    let tableColumnsList = [];
+    let tableDataList = [];
+	let columnFilter = [];
+	var aggregatePaths = [];
+	var aggregateObjects = [];
+	let tableAggregateAliasColumns=this.formAliasFilterPropertes();
+	
+	if(this.typeOfCall){
+	    aggregatePaths = this.state.aggregatePaths;
+	    aggregateObjects = this.state.aggregateObjects;
+	}else{
+	    aggregatePaths = this.state.allAggregatePaths;
+	    aggregateObjects = this.state.allAggregateObjects;
+	}
+	for(var p = 0; p < aggregatePaths.length; p++){
+		var types = [aggregatePaths[p]];
+		var type = types[0];
+		var attributeList = this.getAttributesFromPath(type,tableAggregateAliasColumns);
+		var downloadAllCalled = false;
+		tableColumnsList[type] = [];
+		tableColumnsList[type].push({dataField: 'id', text: 'id', hidden: true });
+		tableDataList[type] = aggregateObjects[type];
+		for(var attrIndex = 0; attrIndex < attributeList.length; attrIndex++){
+			let col=attributeList[attrIndex].split('|').splice(0,2).join('|');
+			let desc=attributeList[attrIndex].split('|')[2];
+			if(!columnFilter[attrIndex] || (columnFilter[attrIndex] && columnFilter[attrIndex][attributeList[attrIndex]] === undefined)){
+				let obj = {};				
+				obj[col] = '';
+				obj['description']=desc
+				columnFilter.push(obj);
+			}
+			  if(!this.typeOfCall){
+				tableColumnsList[type].push({name: col,
+					dataField: col, 
+					text: col, 
+					hidden: false,
+					headerAttrs: {title:desc},				
+					filter: textFilter({getFilter: (f) => { this.setState({filterEnable: true})}})
+				});
+			  }else{
+			    tableColumnsList[type].push({name: col,
+                   	dataField: col,
+                   	text: col,
+					hidden: false,
+					headerAttrs: { title:desc},	
+                   	filter : customFilter(),
+                   	filterRenderer : (onFilter, column) => <AttributeFilter handleOnFilter= {this.handleOnFilter} onFilter={ onFilter } column={ column } isPageChange={this.state.isPageNumberChange} nodeType={type} columnFilter={columnFilter}/>
+                     });
+			  }
+		}
+		if(this.typeOfCall){
+            this.setState({tabularAggregateColumns: tableColumnsList, tabularAggregateData: tableDataList, aggregateAttrList: attributeList,tableAggregateAliasColumns:tableAggregateAliasColumns});
+        }else{
+            this.setState({allTabularAggregateColumns: tableColumnsList, allTabularAggregateData: tableDataList, allAggregateAttrList: attributeList,tableAggregateAliasColumns:tableAggregateAliasColumns}, function(){if(!downloadAllCalled){downloadAllCalled = true;this.downloadAllAggregate();}});
+	}
+	}
+  }
+
+  downloadAggregate = () =>{
+	this.typeOfCall = true;
+    ExportExcel.generateExcelFromTabularViewMultiTabs( this.state.tabularAggregateData, this.state.tabularAggregateColumns, 'AggregateObjects.xlsx');
+  }
+
+  downloadAllAggregate = (pageRange,rangeState) =>{
+	console.log('downloadAllAggregate>>>>>>>>>>>*',pageRange);
+    if(pageRange){
+	  this.typeOfCall=false;
+	  let rangeModelState=(rangeState)? rangeState: false;
+      this.setState(
+        { pageRange: pageRange,isLoading: true,showDownloadResultsModal:rangeModelState,enableModelBusyFeedback:true},
+        function () { this.formQueryString(false,false,false); }.bind(this)
+      );
+    }else{
+      this.setState(
+        {errorDownloadResults: false, showDownloadResultsModal: false, downloadErrorMsg:'', isLoading: false, enableModelBusyFeedback:false},
+        function (){
+			ExportExcel.generateExcelFromTabularViewMultiTabs( this.state.allTabularAggregateData, this.state.allTabularAggregateColumns, 'AggregateObjects.xlsx');
+			this.typeOfCall = true;
+		}.bind(this)
+      );
+	} 
+  }
+  openDownloadRange = () =>{    
+	this.setState({
+	  showDownloadResultsModal: true,
+	  errorDownloadResults: false,
+	  downloadErrorMsg:''});    
+  }
+  closeDownloadResults = () =>{
+	this.setState({
+		showDownloadResultsModal: false,
+		enableModelBusyFeedback: false
+		});   
+  }
+  processData = (resp) => {
+		console.log('Response data: ' + JSON.stringify(resp.data));
+		this.tableFilterAliasColumns=this.formAliasFilterPropertes();
+		if(this.typeOfCall){
+			if (resp.data && resp.data.results) {
+				//this.nodes = data.results;setDefaultViewName
+				this.setState({
+					nodes: resp.data.results,
+					res: resp
+				});
+				this.multipleNodes = this.state.nodes.length > 1;
+				//this.setState({ viewName: "CardLayout" });
+			}
+			let totalResults = 0;
+			let downloadCount = DOWNLOAD_ALL;
+			if(resp.headers) {
+				totalResults = parseInt(resp.headers['total-results']);
+				if(totalResults > DOWNLOAD_ALL){
+					this.downloadAllTooltip = DOWNLOAD_ALL + ' results out of '+ totalResults +' results will be downloaded, Please filter results further to obtain full report';
+				}else{
+					this.downloadAllTooltip = (totalResults === 1) ?'Downloads ' + totalResults + ' Results' : 'Downloads all ' + totalResults + ' Results' ;
+					downloadCount= totalResults;
+				}
+				this.setState({isLoading: false,
+					totalResults: totalResults,
+					totalPages: parseInt(resp.headers['total-pages']),
+					showPagination: resp.headers['total-results'] > 0 ? true : false,
+					showResults: resp.headers['total-results'] > 0 ? true : false,
+					isInitialLoad: false,
+					noResults: resp.headers['total-results'] && resp.headers['total-results'] > 0 ? false : true,
+					errorResults: !resp.headers['total-results'],
+					downloadCount: downloadCount
+				});
+			}
+		}else{
+			if(resp.data && resp.data.results) {
+				this.nodeResults = resp.data.results;
+				let totalResults = 0;
+				let totalPages = 0;
+				if(resp.headers) {
+					totalResults = parseInt(resp.headers['total-results']);
+					totalPages = parseInt(resp.headers['total-pages']);
+				}
+				this.setState({totalPages:totalPages,errorDownloadResults:false,downloadErrorMsg:''},() => {this.getAllExcels()});				
+			}else{
+				this.nodeResults = '';
+				this.setState({ isLoading: false,errorDownloadResults:true,downloadErrorMsg:error+'',enableModelBusyFeedback:false});       
+     		}
+		}
+		GeneralCommonFunctions.scrollTo("outputBlock");
+  }
+
+  close = () => {
+		this.setState({
+			showModal: false
+		});
+  }
+
+  onClick = (event) => {
+		console.log('onClick');
+  }
+
+  onTextAreaChange = (event) => {
+    this.setState({value: event.target.value});
+  }
+
+  onChange = (event, { newValue }) => {
+		console.log('onChange.newValue: ' + newValue);
+		let term = null;
+		this.setState({
+			value: newValue},
+			function () {
+				console.log('onChange.selected: ' + this.state.selected);
+				console.log('onChange.state value set: ' + this.state.value);
+				if (this.state.value.slice(-1) === '(' || this.state.value.slice(-1) === '>') {
+					//this.onSuggestionsFetchRequested(term);
+					term = this.getValue(this.state.value); // this returns term, array of props or rules
+					if (term) {
+					console.log('onChange.term: ' + term.toString());
+					}
+					console.log('onChange.setting suggestions');
+					this.setState({
+						suggestions: term
+					});
+				}else if(this.state.value === ''){
+					inputValue='';
+				}
+			}
+		);
+		// if term exists && term length > 0 - try to load suggestions
+		//if(term && term.length > 0){
+	  	//properties = term.map(property => {
+				//return <div key={property}>{property}<br/></div>;
+	  	//});
+		//}
+	}
+
+  getValue = (term) => {
+		inputValue = '';
+		let isStartNode = (term.split('>')).length <= 1;
+		console.log('getValue.term is: ' + term);
+
+		let toArray = term.split(' ');
+		//console.log('Value' + JSON.stringify(toArray[toArray.length - 1]));
+		if (toArray && toArray.length > 1) {
+			//this.model = term;
+			console.log('getValue.toArray: ' + toArray.length);
+			this.setState({
+			model: term
+			});
+			term = toArray[toArray.length - 1];
+
+		}
+		for (var i = 0; i < toArray.length - 1; i++) {
+			inputValue = inputValue + ' ' + toArray[i];
+		}
+		console.log('getValue.inputValue toArray: ' + inputValue);
+		//console.log(term.slice(-1));
+		if (term.slice(-1) === '(') {
+			console.log('getValue.detected ( property search');
+			var nodeVal = term.slice(0, -1);
+			nodeVal = nodeVal.trim();
+			console.log('getValue.property.nodeVal: ' + nodeVal);
+			var val = [];
+			val = this.state.nodeTypes.filter(v => v.toLowerCase().indexOf(nodeVal.toLowerCase()) > -1);
+			console.log('getValue.val.length: ' + val.length);
+			if (val.length === 0) {
+			  nodeVal = this.state.previousNodeTypeDsl;
+			  inputValue = inputValue + term.slice(0, -1);
+			}else {
+			  inputValue = inputValue + ' ' + nodeVal;
+			}
+			console.log('getValue.inputValue property: ' + inputValue);
+            if (nodeVal) {
+				this.propertiesDsl=this.populateColumnOptions(nodeVal, isStartNode);
+				this.setState({nodeTypeDsl: nodeVal,previousNodeTypeDsl:nodeVal});
+			}
+			term = this.propertiesDsl;
+		} else if (term.slice(-1) === '>') {
+			console.log('getValue.detected > edgerule search');
+			var nodeVal = this.state.previousNodeTypeDsl;
+			nodeVal = nodeVal.trim();
+			console.log('getValue.edgerule.nodeVal: ' + nodeVal);
+			var val = [];
+
+			inputValue = term;
+
+			this.populateEdgeRules(nodeVal);
+			term = traverseRulesDsl;
+		}
+		else {
+			//console.log('getValue.nodeTypes: ' + this.state.nodeTypes);
+			term = (term === '' ? this.state.nodeTypes : this.state.nodeTypes.filter(v => v.toLowerCase().indexOf(term.toLowerCase()) > -1)).slice(0, 10);
+		}
+		//console.log('getValue.term: ' + term);
+		return term;
+ }
+
+  camelToDash = (str) =>  {
+    console.log('camelToDash.str: ' + str);
+		return (str.replace(/\W+/g, '-')
+	  .replace(/([a-z\d])([A-Z])/g, '$1-$2')).toLowerCase();
+  }
+
+  
+  populateColumnOptions = (nodeType, isStartNode) =>{
+	  console.log('populateColumnOptions>>>>>nodeType',nodeType);
+		let propertiesDsl = [];
+		var result = JSON.parse(OXM);
+		var arrayOfTypes = result['xml-bindings']['java-types'][0]['java-type'];
+		//console.dir(arrayOfTypes);
+		var foundIndex = -1;
+		var searchParam = nodeType;
+		//if(['PSERVER', 'COMPLEX', 'CLOUDREGION', 'NETWORKPROFILE', 'VIRTUALDATACENTER'].indexOf(this.nodeType.toUpperCase()) === -1){
+			//searchParam = this.nodeType.substring(0, this.nodeType.length - 1);
+		//}
+		//console.log('nodeType:' + nodeType);
+		if (nodeType.substr(nodeType.length - 3) === 'ies') {
+			searchParam = nodeType.substring(0, nodeType.length - 3) + 'y';
+		}
+
+		if (nodeType.toUpperCase() === 'LINESOFBUSINESS') {
+			searchParam = 'lineOfBusiness';
+		}
+		//console.log('searchParam:' + searchParam);
+		for (var i = 0; i < arrayOfTypes.length && foundIndex === -1; i++) {
+			if (arrayOfTypes[i]['xml-root-element'][0]['$']['name'] === this.camelToDash(searchParam)) {
+			foundIndex = i;
+			}
+		}
+		for (var j = 0; j < arrayOfTypes[foundIndex]['java-attributes'][0]['xml-element'].length; j++) {
+			let property =  arrayOfTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['$']['name'];
+			//console.log('array' + JSON.stringify(property));
+			let type = arrayOfTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['$']['type'];
+			//console.log('type: ' + type);
+			if (type === 'java.lang.String' || type === 'java.lang.Boolean' || type ==='java.lang.Integer' || type ==='java.lang.Long') {
+				let value = '';
+				if(isStartNode !== undefined){
+					value = '(\'' + property + '\',\'Value\')';
+				}else{
+					value= property;
+				}
+				propertiesDsl.push(value);
+			}
+		}
+		//console.log('propertiesDsl: ' + propertiesDsl);
+		let sortedPropertiesDsl = propertiesDsl.sort(function (filter1, filter2) {
+			if (filter1 < filter2) {
+				return -1;
+			} else if (filter1 > filter2) {
+				return 1;
+			} else {
+				return 0;
+			}
+		});
+		//console.log('sortedPropertiesDsl: ' + sortedPropertiesDsl);		
+		if(isStartNode !== undefined){
+			propertiesDsl = sortedPropertiesDsl;
+			//console.log('FilterList' + JSON.stringify(propertiesDsl));
+		}
+		return propertiesDsl;
+		
+  }
+  componentWillReceiveProps(nextProps) {
+		console.log('nextProps......', nextProps);
+		//console.log('this.props.....', this.props);
+		
+		var relArray = false;
+		if(this.props.match.params.relArray){
+			if(nextProps.match.params.relArray){
+				if(nextProps.match.params.relArray !== this.props.match.params.relArray){
+					relArray = true;
+				}
+			}
+		}else{
+			relArray = false;
+		}
+		console.log('relArray>>>>',relArray);
+		this.setState({
+        		isDSLFlow: this.props.viewName === 'BYOQ',
+			isSavedQueryFlow: this.props.viewName === 'Saved Queries',
+			showNodeModal:false
+        	},()=>{if (nextProps.match.params.type && nextProps.match.params.propId &&
+			(nextProps.match.params.type !== this.props.match.params.type || 
+			nextProps.match.params.propId !== this.props.match.params.propId || relArray)) {
+			this.props = nextProps;
+			this.buildDynamicByoq();
+		}});		
+  }
+  populateEdgeRules = (nodeType) => {
+		traverseRulesDsl = [];
+		console.log('populateEdgeRules.nodeType: ' + nodeType);
+		for (var i = 0; i < this.state.edgeRules.length; i++) {
+			var ruleObj = this.state.edgeRules[i];
+			if (ruleObj.from === nodeType) {
+			console.log('from: ' + ruleObj.to);
+			traverseRulesDsl.push(ruleObj.to);
+			}
+			if (ruleObj.to === nodeType) {
+			console.log('to: ' + ruleObj.from);
+			traverseRulesDsl.push(ruleObj.from);
+			}
+		}
+		let traverseRulesDslSorted = traverseRulesDsl.sort(function (filter1, filter2) {
+			if (filter1 < filter2) {
+				return -1;
+			} else if (filter1 > filter2) {
+				return 1;
+			} else {
+				return 0;
+			}
+    });
+		console.log('EdgeRulesList' + JSON.stringify(traverseRulesDslSorted));
+		traverseRulesDsl = traverseRulesDslSorted;
+  }
+
+  // Autosuggest will call this function every time you need to update suggestions.
+  // You already implemented this logic above, so just use it.
+  onSuggestionsFetchRequested = ({ value }) => {
+	  this.setState({
+		suggestions: this.getSuggestions(value)
+	  });
+  };
+  getAllExcels = (pageRange,rangeState) =>{
+	console.log('getAllExcels>>>>>>>>>>>*',pageRange);
+    if(pageRange){
+	  this.typeOfCall=false;
+	  let rangeModelState=(rangeState)? rangeState: false;
+      this.setState(
+        { pageRange: pageRange,isLoading: true,showDownloadResultsModal:rangeModelState,enableModelBusyFeedback:true},
+        function () { this.formQueryString(false,false,false); }.bind(this)
+      );
+    }else{
+    
+      this.setState(
+        {errorDownloadResults: false, showDownloadResultsModal: false, downloadErrorMsg:'', isLoading: false, enableModelBusyFeedback:false},
+        function () { generateExcels(this.nodeResults,this.state.prevQuery);this.nodeResults='';this.typeOfCall = true;}.bind(this)
+	  );
+    }   
+  }
+
+  getTreeFromDSL = (dslQuery) =>{
+     var treeObject = [];
+     var payload = {dsl: dslQuery};
+     settings['ISAPERTURE'] = true;
+     return commonApi(settings, 'dsl/convert-query-to-tree', 'PUT', payload, 'ConvertQueryToTree')
+                         		.then(res => {
+                         			console.log('res:' + res.data, 'load');
+                         			if(res.status === 200 || res.status === 404){
+                         			    if(res.data.status && (res.data.status !== 200 && res.data.status !== 201 && res.data.status !== 404)){
+                         			        this.triggerTreeError(res.data, 'treeLoad');
+                         			        return {};
+                         			    }else{
+                         			        treeObject = res.data;
+                         			        this.setState({
+                                              treeLoadErrMsg: null
+                                            });
+                                           console.log("TREE OBJECT: " + JSON.stringify(treeObject));
+                                           //set the init state
+                                           var initNode = GeneralCommonFunctions.extractNodeDetails(treeObject.children[0], true, this.triggerTreeError, APERTURE_SERVICE);
+                                           if(!this.state.treeLoadErrMsg || this.state.treeLoadErrMsg === ''){
+                                               console.log(JSON.stringify(initNode));
+                                               return initNode;
+                                           }else{
+                                               this.triggerTreeError(null, 'treeLoad');
+                                               return {};
+                                           }
+                                       }
+                                   }else{
+                                     this.triggerTreeError(res.data, 'treeLoad');
+                                     return {};
+                                   }
+                         		}, error=>{
+                         		    if(error.response.status === 404){
+                         		        this.setState({enableTreeLoadBusyFeedback:false});
+                         		        return {};
+                         		    }else{
+                         		        this.triggerTreeError(error.response.data, 'treeLoad');
+                         		        return {};
+                         		    }
+                         		}).catch(error => {
+                         		    this.triggerTreeError(error, 'treeLoad');
+                         		    return {};
+                               })
+  }
+  triggerTreeError = (error, type) => {
+    console.error('[CustomDsl.jsx] error : ', JSON.stringify(error));
+  	let errMsg = '';
+  	if(error && error.status && error.message){
+  	    errMsg += "Error Occurred: " + error.status + ' - ' +error.message;
+  	}else{
+  	    errMsg += "Error Occurred: " + JSON.stringify(error);
+  	}
+  	console.log(errMsg);
+  	if(type === 'treeLoad' || type === 'invalidQuery'){
+  	    var errorMessage = errMsg;
+        this.setState({treeLoadErrMsg: errorMessage, enableTreeLoadBusyFeedback: false});
+    }else{
+        console.log('[CustomDsl.jsx] :: triggerError invoked with invalid type : ' + type);
+    }
+  }
+  getConfigArrayFromDSLTree = (node, configArray, keyArray) =>{
+
+   var tempKey = node.name;
+   var nodeKey;
+   if(keyArray[tempKey]){
+       nodeKey = tempKey + '-' + keyArray[tempKey];
+       keyArray[tempKey] = keyArray[tempKey]++;
+   }else{
+       nodeKey = tempKey;
+       keyArray[tempKey] = 1;
+   }
+   if(node.details && node.details.attrDetails){
+       for (var attr in node.details.attrDetails){
+           if(node.details.attrDetails[attr].filterType && node.details.attrDetails[attr].filterType.length > 0
+                && node.details.attrDetails[attr].filterType[0] !== ""){
+                if(!configArray[nodeKey]){
+                    configArray[nodeKey] = {};
+                    configArray[nodeKey].filters = [];
+                }
+                configArray[nodeKey].filters.push(attr);
+           }
+       }
+   }
+   if(node.children && node.children.length > 0){
+       for(var i = 0; i < node.children.length; i++){
+           configArray = this.getConfigArrayFromDSLTree(node.children[i], configArray, keyArray);
+       }
+   }
+    return configArray;
+  }
+  handlePageChange = (pageNumber) => {
+    console.log('[CustomDsl.jsx] HandelPageChange active page is', pageNumber);
+	this.typeOfCall = true;
+	if(this.state.isAggregateChecked){
+		this.setState(
+			{ aggregateActivePage: pageNumber, isLoading: true, nodes: [], aggregateNodes: [],resetColumnFilters: false, isPageNumberChange: true},
+			function () { this.formQueryString(false,false,false); }.bind(this)
+			);
+	}else{
+		this.setState(
+		{ activePage: pageNumber, isLoading: true, nodes: [], aggregateNodes: [],resetColumnFilters: false, isPageNumberChange: true},
+		function () { this.formQueryString(false,false,false); }.bind(this)
+		);
+	}
+  }
+  // Autosuggest will call this function every time you need to clear suggestions.
+  onSuggestionsClearRequested = () => {
+		this.setState({
+			suggestions: []
+		});
+  };
+
+// https://developer.mozilla.org/en/docs/Web/JavaScript/Guide/Regular_Expressions#Using_Special_Characters
+  escapeRegexCharacters(str) {
+		return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  }
+
+  getSuggestions = (value) => {
+    console.log('getSuggestions.value: ' + value);
+		const escapedValue = this.escapeRegexCharacters(value.trim());
+		const regex = new RegExp('^' + escapedValue, 'i');
+		return nodeTypes.filter(nodeType => regex.test(nodeType));
+  }
+
+
+// When suggestion is clicked, Autosuggest needs to populate the input
+// based on the clicked suggestion. Teach Autosuggest how to calculate the
+// input value for every given suggestion.
+  getSuggestionValue = suggestion => suggestion;
+
+// Use your imagination to render suggestions.
+  renderSuggestion = suggestion => (
+		<div>
+			{suggestion}
+		</div>
+  );
+
+  onSuggestionsUpdateRequested =( { value }) => {
+    console.log('onSuggestionsUpdateRequested.value: ' + value);
+		this.setState({
+			suggestions: getSuggestions(value)
+		});
+  }
+
+  shouldRenderSuggestions = () => {
+		return true;
+  }
+  openHistory = (nodeDisplay, nodeUri, nodeType) => { // open modal from Card
+	console.log('history >> showModal',nodeDisplay);
+	let historyNodeUri = (nodeUri)?nodeUri.replace('/aperture/','/'):nodeUri;
+	let paramToPassThrough = '';
+	if(nodeType){
+		this.setState({
+			nodeDisplay: nodeDisplay,
+			showHistoryModal: true,
+			showModelOptions:true,
+			enableCalendar:true,
+			historyType:(this.state.historyType === 'dsl') ? 'nodeState' : this.state.historyType,
+			focusedNodeUri: historyNodeUri,
+			focusedNodeType: nodeType
+		});
+	}else{
+		this.setState({
+			showHistoryModal:true,
+			showModelOptions:false,
+			enableCalendar:true,
+			historyType : 'dsl',
+			focusedNodeUri: this.state.value,
+			focusedNodeType: nodeType
+		});		
+	}
+  }
+  closeHistory = () => {
+		this.setState({
+			showHistoryModal: false,			
+			enableCalendar:true,
+			historyType :'nodeState'
+		});
+  }
+  submitHistory = () => {
+	console.log("submitting history");
+	let paramToPassThrough = '';
+	if(this.state.focusedNodeType){
+		paramToPassThrough = '/history/' + this.state.historyType +'/' + this.state.focusedNodeType + '/' + btoa(this.state.focusedNodeUri);	
+	}else{
+		paramToPassThrough = '/historyQuery/' + this.state.historyType + '/' + btoa(this.state.value);
+	}
+    let epochStartTime = (this.state.startDate).unix();
+	this.props.history.push(paramToPassThrough + '/' + epochStartTime * 1000);
+  }
+  handleDateChange = (newDate) =>{
+    this.setState({ startDate: moment(+newDate) });
+    console.log('[CustomDsl.jsx] handleDateChange date is ', this.state.startDate);
+    console.log('[CustomDsl.jsx] handleDateChange date is in millis ', +this.state.startDate);
+  }
+
+  setViewName(event) {
+    console.log(event.currentTarget.value);
+    if(this.state.isAggregate && event.currentTarget.value === 'VisualLayout'){
+        this.formQueryString(false, false, true);
+    }
+    this.setState({
+    		viewName: event.currentTarget.value
+    });
+  }
+
+  setDefaultViewName=(event)=>{
+		let ENVIRONMENT = GlobalExtConstants.ENVIRONMENT;
+		let layout =  event.target.value;
+
+		if(sessionStorage.getItem(ENVIRONMENT + 'userId')) {
+			if (event.target.checked) {
+				localStorage.setItem(ENVIRONMENT + '_' + sessionStorage.getItem(ENVIRONMENT + 'userId') + '_viewPreference', layout);
+			} else {
+				localStorage.removeItem(ENVIRONMENT + '_' + sessionStorage.getItem(ENVIRONMENT + 'userId') + '_viewPreference');
+			}
+		}
+
+		this.setState({
+			defaultViewName: event.target.value
+		});
+		this.baseState.viewName=event.target.value;
+		this.baseState.defaultViewName=event.target.value;
+	}
+  openNodeModal(nodeDisplay, nodeUri, nodeType){ // open modal
+                   console.log('customdsl >> showModal');
+                   nodeDisplay = "Node Details of " + nodeUri;
+                   let node = null;
+                   let found = false;
+                   for(var j = 0; j < this.state.nodes.length && !found; j++){
+                      if(this.state.nodes[j].url === nodeUri){
+                          node = this.state.nodes[j];
+                          found = true;
+                      }
+                   }
+                   if(nodeDisplay && found){
+                      this.setState({
+                         nodeDisplay: nodeDisplay,
+                         focusedNode: node,
+                         showNodeModal:true
+                      });
+                   }else{
+                       this.setState({
+                       showNodeModal:true
+                       });
+                   }
+    }
+
+    closeNodeModal = () => {
+      this.setState({
+      	showNodeModal: false
+      });
+    }
+
+  componentDidUpdate(prevProps, prevState, snapshot) {
+    if((this.state.isAggregate || this.state.aggregateNodes.length > 0 || this.state.nodes.length > 0) && !this.state.visualAddition){
+        //Visualization.chart('currentState', [], [], this.state.res.data, this);
+        this.setState({
+            		visualAddition: true
+        });
+    }
+  }
+  setHistoryType(event) {
+    console.log(event.target.value);
+    let enableCalendar = false;
+    if(event.target.value === 'nodeLifeCycle'){
+        enableCalendar = false;
+    }else{
+        enableCalendar = true;
+    }
+    this.setState({
+    		historyType: event.target.value,
+    		enableCalendar: enableCalendar
+    });
+    console.log(this.state.enableCalendar);
+  }
+  loadBulkCallback=(loadQueryList)=>{
+	console.log('Start:Load bulk Callback>>>>>>');
+	let filterEntriesList=[];
+	let filterTemplateHeaderList=[];
+	let filterTemplateErrorList=[];
+	let nodeTypeOfDslTemplateList=[];
+	let templateQueryList=[];
+	let valueList=[];
+	this.dslObjectList=[];
+	this.nodeTypeArrayList=[];
+	this.tempDslQueryList=[];
+	this.templateErrorList={};
+	let isAggregateCheckedList=[];
+	let associatedNodesEnabledList=[];
+	let queryNameList=[];
+	let queryDescriptionList=[];
+	let categoryList=[];
+	let isPublicCheckedList=[];
+	let queryIdList=[];
+	let filterTypeDisplayList=[];
+	let isCommunitySharedList = [];
+	let staticTemplateFiltersList=[];
+	for(var idx=0;idx<loadQueryList.length;idx++){
+		let splitString = loadQueryList[idx].split('||');
+		let name = splitString[0];
+		let description = splitString[1];
+		let category=(splitString[2] !== 'undefined')? splitString[2]:'';
+		let dsl = splitString[3];
+		let isAggregate = splitString[4];
+		let type = splitString[5];
+		let queryId = splitString[6];
+		let isCommunityShared = splitString[7];
+		let templateDetails = splitString[8];
+		if(name !== '' && description !== '' && this.state.isSavedQueryFlow){
+		    var staticTemplateFilters = templateDetails;
+            if(staticTemplateFilters.length > 0){
+              staticTemplateFilters = JSON.parse(staticTemplateFilters);
+            }else{
+              staticTemplateFilters = [];
+            }
+            staticTemplateFiltersList.push(staticTemplateFilters);
+			queryNameList.push(name);
+			queryIdList.push(queryId);
+			queryDescriptionList.push(description);
+			isPublicCheckedList.push(type === 'public');
+			categoryList.push(category);
+			isCommunitySharedList.push(isCommunityShared);			
+		}
+		associatedNodesEnabledList.push(false);
+		if(isAggregate === "true"){
+			isAggregateCheckedList.push(true);
+		}else{
+			isAggregateCheckedList.push(false);		
+		}
+		filterTypeDisplayList.push({'default':'Filter Type'});
+		this.setState({
+			queryNameList:queryNameList,
+			queryDescriptionList:queryDescriptionList,
+			categoryList:categoryList,
+			isPublicCheckedList: isPublicCheckedList,
+			queryIdList: queryIdList,
+			filterTemplateEntries:[],
+			filterTemplateError: false,
+			isTypeahead: false,
+			isAggregateCheckedList: isAggregateCheckedList,
+			associatedNodesEnabledList: associatedNodesEnabledList,
+			filterTypeDisplayList: filterTypeDisplayList,
+			downloadTemplateStatus:false,
+			failedDownloadedTemplate:[],
+			failedDownloadedTemplateMsg:'',
+			failedEmailTemplateMsg:'',
+			emailTriggerMsg:'',
+		  	isMergedTabsChecked: false,
+		  	staticTemplateFiltersList: staticTemplateFiltersList
+		});
+		
+		if(this.state.isSavedQueryFlow){
+							
+			dsl=atob(dsl).replace('<pre>','').replace('</pre>','');			
+			this.dslObject={};
+			this.nodeTypeArray=[];
+				
+			var limitPattern = /limit[\s]\d+|limit\d+/ig;
+			var limitkey = dsl.match(limitPattern);
+			if(limitkey){
+				dsl = dsl.replace(limitkey[limitkey.length-1],'').trim();
+			}
+			dsl = this.alterDslQueryByRemoveSpaces(dsl);
+			//create placeholders for NodeTypes with Propand Propvalues
+			this.tempDslQuery=this.formTempDslQuery(dsl);
+			this.tempDslQueryList.push(this.tempDslQuery);
+			//Preparinga Json Object to render into Placeholder		
+			this.contructDslNodes(dsl,'node',false,false,false,false);
+			//Query to replace placeholders with JSON Object values depends on Flow either SavedQuery or TableFilters
+			let query=this.formTemplateQuery('savedQuery',idx,true);
+			query=query.replace(/\'(as)\'/g,'\' as \'').replace(/\(\'\s(as)\s\'\)/g,'(\'as\')');
+			if(limitkey){
+				query+=' '+limitkey[limitkey.length-1];		
+			}	
+			let filterEntries=[];
+			let filterTemplateHeader={};
+			var errorOccurred=false;
+			Object.keys(this.dslObject).map((key)=>{
+				filterEntries.push(this.dslObject[key]['filterEntries'][0]);
+				filterTemplateHeader[key]= {}
+				filterTemplateHeader[key]=this.dslObject[key]['filterTemplateHeader'][key];
+				if(!errorOccurred){
+					errorOccurred=this.dslObject[key]['errorOccurred'];
+				}	
+			});			
+			filterEntriesList.push(filterEntries);
+			filterTemplateHeaderList.push(filterTemplateHeader);
+			filterTemplateErrorList.push(errorOccurred);
+			nodeTypeOfDslTemplateList.push(this.nodeTypeArray);
+			templateQueryList.push(query);
+			valueList.push(dsl);
+			this.dslObjectList.push(this.dslObject);
+
+		}
+	}
+	this.setState({ valueList: valueList, 
+		templateQueryList: templateQueryList, 
+		filterTemplateEntriesList: filterEntriesList,
+		filterTemplateHeaderList:filterTemplateHeaderList,
+		filterTemplateErrorList: filterTemplateErrorList,
+		nodeTypeOfDslTemplateList:nodeTypeOfDslTemplateList,		
+		isAggregateCheckedList: isAggregateCheckedList,
+		associatedNodesEnabledList: associatedNodesEnabledList,
+		isInitialLoad:false
+	},()=>{GeneralCommonFunctions.scrollTo('templateList');});
+  }
+  loadCallback = (name, description, category, dslQuery, isAggregate, type, queryId, isCommunityShared, id, templateDetails, makeCall) =>{
+  	let filterEntriesList=[];
+	let filterTemplateHeaderList=[];
+	let filterTemplateErrorList=[];
+	let nodeTypeOfDslTemplateList=[];
+	let templateQueryList=[];
+	let valueList=[];
+	this.dslObjectList=[];
+	this.nodeTypeArrayList=[];
+	this.tempDslQueryList=[];
+	this.templateErrorList={};
+	let isAggregateCheckedList=[];
+	let associatedNodesEnabledList=[];
+	let queryNameList=[];
+	let queryDescriptionList=[];
+	let categoryList=[];
+	let isPublicCheckedList=[];
+	let queryIdList=[];
+	let filterTypeDisplayList=[];
+	let isCommunitySharedList=[];
+	let staticTemplateFiltersList=[];
+	let idx=parseInt(id);
+	if(isNaN(idx)){
+		idx=0;
+	}
+    if(name !== '' && description !== '' && this.state.isSavedQueryFlow){		
+		queryNameList.push(name);
+		queryIdList.push(queryId);
+		queryDescriptionList.push(description);
+		isPublicCheckedList.push(type === 'public');
+		var staticTemplateFilters = templateDetails;
+        if(staticTemplateFilters.length > 0){
+          staticTemplateFilters = JSON.parse(staticTemplateFilters);
+        }else{
+          staticTemplateFilters = [];
+        }
+        staticTemplateFiltersList.push(staticTemplateFilters);
+		categoryList.push(category);
+		isCommunitySharedList.push(isCommunityShared);
+      	this.setState({
+		  queryNameList:queryNameList,
+		  queryDescriptionList:queryDescriptionList,
+		  categoryList:categoryList,
+		  isPublicCheckedList: isPublicCheckedList,
+		  isCommunitySharedChecked: isCommunityShared === "true",
+		  queryIdList: queryIdList,
+		  isCommunitySharedList:isCommunitySharedList,
+		  staticTemplateFiltersList: staticTemplateFiltersList,
+		  downloadTemplateStatus:false,
+		  failedDownloadedTemplate:[],
+		  failedDownloadedTemplateMsg:'',
+		  failedEmailTemplateMsg:'',
+		  emailTriggerMsg:'',
+		  isMergedTabsChecked: false,
+		  isGenerateEmailChecked: false
+      	});
+    }
+    //reset any filter template forms
+	this.setState({ filterTemplateEntries: [], filterTemplateError: false, isTypeahead: false});
+	associatedNodesEnabledList.push(false);
+	let associatedNodesEnable=false;
+	let isAggregateChecked=false;
+    if(isAggregate === "true"){
+		isAggregateCheckedList.push(true);
+		isAggregateChecked=true;
+    }else{
+        isAggregateCheckedList.push(false);		
+    }
+    this.setState({ isAggregateCheckedList: isAggregateCheckedList, associatedNodesEnabledList: associatedNodesEnabledList,isAggregateChecked:isAggregateChecked,associatedNodesEnabled:associatedNodesEnable});	
+    if(this.state.isSavedQueryFlow && !makeCall){
+        this.loadTemplateForm(atob(dslQuery).replace('<pre>','').replace('</pre>',''),idx);
+    }else{
+		this.setState({viewName: this.state.defaultViewName,
+                       activePage: 1,
+                       aggregateActivePage: 1});
+        this.buildDynamicByoq(atob(dslQuery).replace('<pre>','').replace('</pre>',''), makeCall);
+    }
+    if(this.state.isDSLFlow){
+        GeneralCommonFunctions.scrollTo("jumbotron");
+    }else if(this.state.isSavedQueryFlow){
+        GeneralCommonFunctions.scrollTo("templateList");
+    }
+  }
+
+  editCallback = (name, description, category, dsl, isAggregateStr, type, queryId, isCommunityShared, templateDetails) =>{
+  	//Save stated of loaded queries
+  	this.state.valuePreviousState = this.state.value;
+  	this.state.isAggregateCheckedPreviousState = this.state.isAggregateChecked;
+  	this.state.isCommunitySharedCheckedPreviousState = this.state.isCommunitySharedChecked;
+    this.state.associatedNodesEnabledPreviousState = this.state.associatedNodesEnabled;
+
+  	let isAggregateChecked = false;
+  	let isCommunitySharedChecked = false;
+  	let associatedNodesEnabled = false;
+
+  	if(isAggregateStr === 'true'){
+  		isAggregateChecked = true;
+  		associatedNodesEnabled = true;
+  	}
+
+  	if(isCommunityShared === 'true'){
+    	isCommunitySharedChecked = true;
+    }
+
+    var staticTemplateFilters = templateDetails;
+    if(staticTemplateFilters.length > 0){
+        staticTemplateFilters = JSON.parse(staticTemplateFilters);
+    }else{
+        staticTemplateFilters = [];
+    }
+    this.getTreeFromDSL(dsl).then(tree => {
+         this.setState({
+                        enableTreeLoadBusyFeedback: false,
+                        dslConfigArray: this.getConfigArrayFromDSLTree(tree, [], []),
+                        showSaveModal: true,
+                        saveSuccessfulMsg: false,
+                        isPublicChecked: type === 'public',
+                        isEditModal:true,
+                        queryName:name,
+                        queryDescription:description,
+                        category:category,
+                        isAggregateChecked: isAggregateChecked,
+                        isCommunitySharedChecked: isCommunitySharedChecked,
+                        associatedNodesEnabled: associatedNodesEnabled,
+                        value: dsl,
+                        queryId: queryId,
+                        staticTemplateFilters: staticTemplateFilters
+                        });
+    });
+  }
+
+  saveTemplate = (idx) => {
+	  var saveModal = () => {
+	  	this.setState(
+	  		{
+				  showSaveModal: true,
+				  saveSuccessfulMsg: false,
+				  isPublicChecked: this.state.isPublicChecked,
+				  isEditModal:false,
+				  queryName:'',
+				  queryDescription:'',
+				  category:'',
+				  queryId:'',
+				  isPublicChecked: this.state.isPublicCheckedList[idx],
+				  isAggregateChecked: this.state.isAggregateCheckedList[idx],
+				  enableTreeLoadBusyFeedback: true
+			});
+		this.getTreeFromDSL(this.state.value).then(tree => {
+                this.setState({enableTreeLoadBusyFeedback: false, dslConfigArray: this.getConfigArrayFromDSLTree(tree, [], [])});
+        });
+	  }
+	  this.populateTemplate(false, saveModal, idx);
+  }
+
+  runTemplate = (idx) =>{
+    this.populateTemplate(true, null, idx);
+  }
+  submitEditAndRunDSL = () =>{
+    this.setState({ showEditModal: false, value: this.state.editModel,aggregateActivePage:1,activePage:1 }, () => this.formQueryString(false,false,false));
+  }
+  showEditDSLModal = (idx) => {
+    console.log("enabling DSL edit modal");
+    var openModal = () => {
+        this.setState({ editModel: this.state.value, enableTreeLoadBusyFeedback: true, showEditModal: true });
+    }
+    this.populateTemplate(false, openModal, idx);
+  }
+  closeEditDSLModal = () => {
+    console.log("closing DSL edit modal");
+    this.setState({ showEditModal: false, enableTreeLoadBusyFeedback: false });
+  }
+  bindEdits = (e) => {
+    this.setState({ editModel: e.target.value });
+  }
+  populateTemplate = (shouldRun, callback, indx) =>{
+	console.log('CustomDSL:populateTemplate this.state>>>>>>>>>>>>>>>>>>>*',this.state);
+	let query=this.formFinalTemplateQuery(indx);
+	console.log('CustomDSL:query>>>>>>>>>*',query);
+	console.log('CustomDSL:query>>>>>>>>>BTOA*',btoa(query));
+    this.setState({ value: query,aggregateActivePage:1,activePage:1}, () => {if(shouldRun){this.formQueryString(false,false,false)}else{callback()}});
+  }
+  formFinalTemplateQuery = (indx)=>{
+	console.log('formFinalTemplateQuery>> forming finalQuery before Run scenarios>>>>');
+	var query = this.state.templateQueryList[indx];
+	for(var i = 0; i < this.state.filterTemplateEntriesList[indx].length; i++){
+		let filterTemplateEntries=this.state.filterTemplateEntriesList[indx][i];
+		Object.keys(filterTemplateEntries).map((key)=>{
+			Object.keys(filterTemplateEntries[key]).map((entry)=>{
+				let templateEntry=filterTemplateEntries[key][entry];
+				if(templateEntry.name !== ''){
+					let templateFilterQuery = "'" + templateEntry.name + "','" + templateEntry.value + "'";
+					console.log('Before templateFilterQuery>>>>>',templateFilterQuery);
+					let valueArray=templateEntry.value.split('^');
+					let typeArray=templateEntry.type.split('^');
+					templateFilterQuery = "'" + templateEntry.name + "'";
+					let templatekeyValues='';
+					for(var x=0;x<valueArray.length;x++){
+						if(valueArray[x] !==''){
+							if(templatekeyValues === ''){									
+								templatekeyValues = (this.state.enableRealTime)?typeArray[x] +"('" + valueArray[x] + "')":"'"+valueArray[x]+"'";
+							}else{
+								templatekeyValues = (this.state.enableRealTime)?templatekeyValues+","+typeArray[x] +"('" + valueArray[x] + "')":templatekeyValues+",'"+ valueArray[x] + "'";
+							}
+						}
+					}
+					templateFilterQuery=templateFilterQuery+","+templatekeyValues;
+					console.log('templateFilterQuery>>>>>',templateFilterQuery);
+					query = query.replace('$' + (templateEntry.templateKey + 1),templateFilterQuery);
+					query = query.replace(/\"/g,'\'');
+				}
+			})			
+		});		
+	}
+	return query;
+  }
+  stripFirstCharacter=(str)=>{
+	return str.substr(1);
+  }
+  stripLastCharacter=(str)=>{
+	return str.substr(0, str.length - 1);
+  }
+  stripFirstTwoCharacter(str){
+	return str.substr(2);
+  }
+  updateTemplateFilterValues=(key,templateKey,value,id,idx)=>{
+	if(value!==''){
+	  var filterTemplateEntriesList = this.state.filterTemplateEntriesList;
+	  var filterTemplateHeaderList=this.state.filterTemplateHeaderList;
+	  var filterMap = filterTemplateEntriesList[idx];
+	  var filterTemplateHeader=filterTemplateHeaderList[idx];
+	  let idArray=id.split('_');
+	  let ind=parseInt(idArray[idArray.length-1]);
+	  let finalSelectedProp='';
+	  let existing=false;
+	  console.log(ind+'<<<updateTemplateFilterValues>>>>'+key+'<><>',value);
+	  console.log(templateKey+'filterMap>>>>>>>>>>>>>>>>',filterMap);
+	  Object.keys(filterMap).forEach((index) =>{
+		  if(filterMap[index][key]){
+			  Object.keys(filterMap[index][key]).forEach((i)=>{
+				  if(filterMap[index][key][i].templateKey === templateKey){
+					  console.log(key+'<<filterMap[index][key][templateKey]>>>'+filterMap[index][key][i]);
+					  let filterValue=filterMap[index][key][i].value.split('^');
+					  filterValue[ind]=value;
+					  filterMap[index][key][i].value=filterValue.join('^');
+					  console.log('Updated Filtered Template Entries map' + JSON.stringify(filterMap));						
+					  if(filterMap[index][key][i].name !== '' ){
+						  filterTemplateHeader[key]['propName'] = filterMap[index][key][i].name;
+						  existing =true;
+					  }else{
+						  console.log('set listname >>>>***',filterTemplateHeader[key]['propName']);
+						  finalSelectedProp=filterTemplateHeader[key]['propName'];
+						  let status=false;
+						  if(filterTemplateHeader[key]['propName'] !== this.state.filterDisplay){							  
+							filterMap[index][key][i].name= filterTemplateHeader[key]['propName'];
+							status=true;
+						  }else{
+							filterMap[index][key][i].name= 'ERROR';
+							if(!(this.templateErrorList[idx] && this.templateErrorList[idx].length>0)){
+								this.templateErrorList[idx]=[];
+							}
+							this.templateErrorList[idx].push(key);
+						  }
+						  let selectedProp=[];
+						  console.log('filterTemplateHeader[key][selectedProp]>>>>',filterTemplateHeader[key]['selectedProp']);
+						  if(filterTemplateHeader[key]['selectedProp'] && status){
+							  selectedProp=filterTemplateHeader[key]['selectedProp'];
+							  let indSelect= selectedProp.indexOf(filterTemplateHeader[key]['propName']);
+							  if(indSelect !== -1){
+								  selectedProp=selectedProp.splice(indSelect,1);
+								  filterTemplateHeader[key]['selectedProp']=selectedProp;
+							  }					
+						  }									
+					  }				
+					  filterTemplateHeader[key]['enableAnd'] = true;
+					  this.updateSavedQueryTemplate('add',key,templateKey,filterMap,filterTemplateHeader,idx);
+				  }
+			  });				
+		  }
+	  });
+	}
+	// this.setState({filterTemplateError: true});     
+}
+updateSavedQueryTemplate=(action,key,templatekey,templateMaps,templateHeader,idx)=>{
+		console.log(action+'updateSavedQueryTemplate>>>>>>>>>>>>>*');
+		let templateEntriesList = this.state.filterTemplateEntriesList;
+		let filterTemplateHeaderList=this.state.filterTemplateHeaderList;
+		let templateEntries = templateEntriesList[idx];
+		let filterTemplateHeader= filterTemplateHeaderList[idx];
+		let finalSelectedProp='';
+		idx=parseInt(idx);
+		if(templateMaps){
+		  templateEntries=templateMaps;
+		}
+		if(templateHeader){
+		  filterTemplateHeader=templateHeader
+		}
+		let templateQuery = this.state.templateQueryList[idx];
+		if(templateQuery.charAt(templateQuery.length-1) !== ']'){
+		  templateQuery=templateQuery+',';
+		}	
+		let keyact=isNaN(parseInt(key.substr(key.length-2,key.length-1)));
+		console.log('keyact>>>>****',keyact);
+		console.log('TemplateQuery>>>&&*',templateQuery);
+		let nodeInd=0;
+		let tempkey =key;
+		if(!keyact){
+			  let actKey=key.split('-');
+			  nodeInd=parseInt(actKey[actKey.length-1]);
+			  actKey.splice(actKey.length-1,1);
+			  tempkey=actKey.join('-');
+		}
+		let dslObject=this.dslObjectList[idx];
+		if(action === 'add'){
+			Object.keys(dslObject).map((nodekey)=>{
+			  if(nodekey === key){
+				  let tempEntries=[];			 
+				  Object.keys(templateEntries).map((index) =>{if(templateEntries[index][key] && nodekey === key){ tempEntries= templateEntries[index][key]}});
+				  console.log('tempEntries>>>>',tempEntries); 
+				  dslObject[nodekey]['templateEntries']=tempEntries;
+				  dslObject[nodekey]['filterTemplateHeader']=filterTemplateHeader[nodekey];
+			  }		  
+			})
+		}else{
+		  let findEntry=true;
+		  Object.keys(templateEntries).map((index) =>{
+			  console.log('templateEntries[index][key]??????',templateEntries[index][key]);
+			  if(templateEntries[index][key]){
+				  Object.keys(templateEntries[index][key]).map((i)=>{
+					  console.log(i+'templateEntries[index][key][i].templateKey>>>',templateEntries[index][key][i]);
+					  if(findEntry && templateEntries[index][key][i].templateKey === templatekey){
+						  findEntry=false;
+						  let name = templateEntries[index][key][i].name;
+						  finalSelectedProp=name;
+						  templateEntries[index][key].splice(i,1);
+						  filterTemplateHeader[key]['enableAnd'] = true;
+						  filterTemplateHeader[key]['propName'] = this.state.filterDisplay;
+						  let selectedProp=[];
+						  console.log('filterTemplateHeader[key][selectedProp]???????',filterTemplateHeader[key]['selectedProp']);
+						  if(filterTemplateHeader[key]['selectedProp']){
+							  selectedProp=filterTemplateHeader[key]['selectedProp'];
+							  let ind= selectedProp.indexOf(name);
+							  if(ind !== -1){
+								  selectedProp=selectedProp.splice(ind,1);
+								  filterTemplateHeader[key]['selectedProp']=selectedProp;
+							  }	
+						  }
+						  if(name=='ERROR'){
+							if(this.templateErrorList[idx] && this.templateErrorList[idx].length>0){
+								this.templateErrorList[idx].pop();
+							}							
+						  }
+						  console.log('selectedProp>>>>',filterTemplateHeader[key]['selectedProp']);
+					  }
+				  });	
+			  }
+		  });
+		  Object.keys(dslObject).map((nodekey)=>{
+			  if(nodekey === key && !findEntry){
+				let tempEntries=[];			 
+				Object.keys(templateEntries).map((index) =>{if(templateEntries[index][key] && nodekey === key){ tempEntries= templateEntries[index][key]}});
+				console.log('Delete tempEntries>>>>',tempEntries); 
+				dslObject[nodekey]['templateEntries']=tempEntries;
+				dslObject[nodekey]['filterTemplateHeader']=filterTemplateHeader[nodekey];
+			  }		  
+		  })
+		}
+		console.log(action+' .......Update Saved ***************this.dslObject',dslObject);
+		Object.keys(dslObject).map((nodekey)=>{
+			  //console.log(nodekey+'this.dslObject[nodekey][0]>>>>>',dslObject[nodekey][0]);
+			  //console.log('key>>>>',key);
+			  if(nodekey === key && dslObject[nodekey][0]){
+				  Object.keys(templateEntries).map((index) =>{
+					  console.log('templateEntries[index][key]>>>>',templateEntries[index][key]);
+					  if(templateEntries[index][key]){
+						 let props='{';
+						 Object.keys(templateEntries[index][key]).map((i)=>{
+							console.log(i+'templateEntries[index][key]>>>>',templateEntries[index][key][i]);
+							  let prop='';
+							  let newProps=(parseInt(i)!==0)?',\''+templateEntries[index][key][i]['name']+'\'':'\''+templateEntries[index][key][i]['name']+'\'';	
+							  props+=newProps;
+							  if(templateEntries[index][key][i].templateKey === templatekey){
+								  let name=templateEntries[index][key][i]['name']
+								  let value=templateEntries[index][key][i]['value'].split('^');
+								  let type=templateEntries[index][key][i]['type'].split('^');
+								  prop='(\''+name+'\',';
+								  for(var x=0;x<value.length;x++){
+									  if(this.state.enableRealTime){
+										  prop+=type[x]+'(\''+value[x]+'\')';
+										  if(x===value.length-1){
+											  prop+=')';
+										  }else{
+											  prop+=',';
+										  }	
+									  }else{
+										  prop+='\''+value[x]+'\'';
+										  if(x===value.length-1){
+											  prop+=')';
+										  }else{
+											  prop+=',';
+										  }
+									  }
+								  }
+								  let values=dslObject[nodekey][0]['values'];
+								  //console.log('values>>>>>',values);
+								  if(values && values.length>0){
+									let findState=false;
+									let errorPropMsg=null;									
+									for(var n=0;n<values.length;n++){
+										if(values[n].indexOf('!(\''+name+'\'') !==-1){
+											values[n]='!'+prop;
+											findState=true;
+										}else if(values[n].indexOf('(\''+name+'\'') !==-1){
+											values[n]=prop;
+											findState=true;
+										}
+										if(values[n].indexOf('(\'ERROR\',') !==-1){
+											errorPropMsg=n;
+										}
+									}
+									if(errorPropMsg){
+										values.splice(errorPropMsg,1);
+									}
+									if(!findState){
+										values.push(prop);
+									}
+									dslObject[nodekey][0]['values']=values;									
+								 }else{
+									dslObject[nodekey][0]['values']=[];
+									dslObject[nodekey][0]['values'].push(prop);
+								 }
+								 //console.log(prop+'this.dslObject[nodekey][0][values]>>>>',dslObject[nodekey][0]['values']);
+							  }
+						  });
+						  props+='}';						  
+						  if(action!=='add' && dslObject[nodekey][0]['values']){
+							  dslObject[nodekey][0]['values'].splice(idx,1);								
+						  }
+					  }
+				  });
+			  }		  
+		});
+		//console.log('After Setting ***************this.dslObject',dslObject);		
+		this.dslObjectList[idx]=dslObject;
+		let queryList=this.state.templateQueryList;
+		let dslquery=queryList[idx];
+		var limitPattern = /limit[\s]\d+|limit\d+/ig
+		var limitkey = dslquery.match(limitPattern);		
+		//this.tempDslQuery=this.formTempDslQuery(dsl);
+		let query=this.formTemplateQuery('savedQuery',idx);
+		query=query.replace(/\'(as)\'/g,'\' as \'').replace(/\(\'\s(as)\s\'\)/g,'(\'as\')');
+		if(limitkey){
+			query+=' '+limitkey[limitkey.length-1];		
+		}	
+		console.log('query>>>>>>>>>>>>>',query);
+		queryList[idx]=query;
+		templateEntriesList[idx]=templateEntries;
+		filterTemplateHeaderList[idx]=filterTemplateHeader;
+		this.setState({filterTemplateEntriesList:templateEntriesList,filterTemplateHeaderList:filterTemplateHeaderList,templateQueryList:queryList}); 
+	  
+  }	
+  capturingGroups=(dsl)=>{
+	var capturedGroups=[];
+	let findGroup=true;
+	var block = dsl;
+	do{
+		var startIndex = block.indexOf('['),/* index of first bracket */
+		currPos = startIndex,
+		openBrackets = 0,
+		stillSearching = true,
+		waitForChar = false;
+		if(currPos === -1){
+			findGroup=false;
+		}
+		while (stillSearching && currPos <= block.length) {
+		  var currChar = block.charAt(currPos);
+		  switch (currChar) {
+			  case '[':
+				openBrackets++; 
+				break;
+			  case ']':
+				openBrackets--;
+				break;			  
+			}		  
+		  currPos++ 
+		  if (openBrackets === 0) { stillSearching = false; } 
+		}
+		console.log('capturingGroups>>>>>>>>>>>>',block.substring(startIndex , currPos));
+		if(block.substring(startIndex , currPos) !==''){
+			capturedGroups.push(block.substring(startIndex , currPos));
+			block=block.replace(block.substring(startIndex , currPos),'#$')
+		}
+	}while(findGroup);		
+	return capturedGroups;
+  }
+  formTempDslQuery=(dsl) =>{
+	let tempQuery='';
+	tempQuery=dsl.replace(/\!\((?:[^>)(]|\((?:[^)(]+)\))*\)/g,'').replace(/\((?:[^>)(]|\((?:[^)(]+)\))*\)/g,'').replace(/\{(.*?)\}/g,'').replace(/\*/g,'').trim('')+',';
+	tempQuery = tempQuery.replace(/\s+/g, '');
+	tempQuery=tempQuery.replace(/[a-zA-Z0-9*\-]/g,'#').replace(/\!\!/g,'!').replace(/\!\>/g,'>');
+	tempQuery=tempQuery.replace(/\#(.*?)(?=\>|\!|\(|\)|\,|\])/g,'#').trim('');
+	tempQuery=this.stripLastCharacter(tempQuery);
+	return tempQuery;
+  }
+  loadTemplateForm=(dsl,idx) =>{
+	console.log('loadTemplateForm>>>idx>>>>',idx);
+	this.dslObject={};
+	this.nodeTypeArray=[];
+	var limitPattern = /limit[\s]\d+|limit\d+/ig;
+	var limitkey = dsl.match(limitPattern);
+	if(limitkey){
+		dsl = dsl.replace(limitkey[limitkey.length-1],'').trim();
+	}
+	dsl = this.alterDslQueryByRemoveSpaces(dsl);
+	//create placeholders for NodeTypes with Propand Propvalues
+	this.tempDslQuery=this.formTempDslQuery(dsl);
+	this.tempDslQueryList.push(this.tempDslQuery);
+	//Preparinga Json Object to render into Placeholder		
+	this.contructDslNodes(dsl,'node',false,false,false,false);
+	console.log('dsl>>>>>>>>>>>>>',dsl);
+	//Query to replace placeholders with JSON Object values depends on Flow either SavedQuery or TableFilters
+	let query=this.formTemplateQuery('savedQuery',idx,true);
+	query=query.replace(/\'(as)\'/g,'\' as \'').replace(/\(\'\s(as)\s\'\)/g,'(\'as\')');
+	if(limitkey){
+		query+=' '+limitkey[limitkey.length-1];		
+	}	
+	let filterEntries=[];
+	let filterTemplateHeader={};
+	var errorOccurred=false;
+	console.log('before setting DSLOBJECT>>',this.dslObject);
+	Object.keys(this.dslObject).map((key)=>{
+		filterEntries.push(this.dslObject[key]['filterEntries'][0]);
+		filterTemplateHeader[key]= {}
+		filterTemplateHeader[key]=this.dslObject[key]['filterTemplateHeader'][key];
+		if(!errorOccurred){
+			errorOccurred=this.dslObject[key]['errorOccurred'];
+		}	
+	});	
+	let filterEntriesList=[];
+	let filterTemplateHeaderList=[];
+	let filterTemplateErrorList=[];
+	let nodeTypeOfDslTemplateList=[];
+	let templateQueryList=[];
+	let valueList=[];
+	if(idx === 0){
+		this.setState({ valueList: [], 
+			templateQueryList: [], 
+			filterTemplateEntriesList: [],
+			filterTemplateHeaderList:[],
+			filterTemplateErrorList: [],
+			nodeTypeOfDslTemplateList:[]
+		});
+	}
+	filterEntriesList.push(filterEntries);
+	filterTemplateHeaderList.push(filterTemplateHeader);
+	filterTemplateErrorList.push(errorOccurred);
+	nodeTypeOfDslTemplateList.push(this.nodeTypeArray);
+	templateQueryList.push(query);
+	valueList.push(dsl);
+	this.dslObjectList.push(this.dslObject);    
+	this.setState({ valueList: valueList, 
+		templateQueryList: templateQueryList, 
+		filterTemplateEntriesList: filterEntriesList,
+		filterTemplateHeaderList:filterTemplateHeaderList,
+		filterTemplateErrorList: filterTemplateErrorList,
+		nodeTypeOfDslTemplateList:nodeTypeOfDslTemplateList,
+		isInitialLoad:false
+	},()=>{GeneralCommonFunctions.scrollTo('templateList');});
+	
+  }
+ formTemplateQuery=(flow,idx,state)=>{
+	let query='';
+	let count = 0;
+	let tempDslQueryArr=(idx !== undefined && !state)?this.tempDslQueryList[idx].split('#'):this.tempDslQuery.split('#');
+	let newCustomQuery=(idx !== undefined && !state)?this.dslObjectList[idx]:this.dslObject;
+	Object.keys(newCustomQuery).map((key)=>{
+		query='';
+		let newDslObject=newCustomQuery[key][0];
+		let filterValues='';
+		if(newDslObject){
+			//console.log('this>>>>>>>>>>>>>>>>>>>>>>',this);
+			if(flow==='savedQuery'){				
+				//reformed the DSL Object with Filter Entries and Template Entries
+				this.formTemplateFilterValues(newDslObject['values'],newDslObject['nodeName'],key,idx);
+				let entries=[];
+				if(newCustomQuery[key]['templateEntries']){
+					entries=newCustomQuery[key]['templateEntries'];
+				}else{
+					entries='';
+				}
+				filterValues=(newDslObject['values']) ? this.replaceFilterValues(newDslObject['values'],entries) :'';
+			}else{
+				filterValues=(newDslObject['values'])? this.formFilterValues(newDslObject['values']):'';
+			}
+			query+=newDslObject['nodeName'];
+			if(newDslObject['props']){
+				query+=newDslObject['props'];
+			}
+			if(newDslObject['values']){
+				query+=filterValues;			
+			}
+			tempDslQueryArr[count]=tempDslQueryArr[count]+query;
+			count++;
+		}
+	});
+	query=tempDslQueryArr.join('');
+	return query;
+ }
+ contructDslNodes=(dsl,type,groupStart,groupEnd,edgeStart,edgeEnd)=>{	    
+	console.log(type+'contructDslNodes>>>>>>>>>>>>>>',dsl);	
+	dsl=dsl.replace(/\s*\,\s*/g, ',')
+	var declareEdgePattern=/\(\>(?:[^)(]+|\((?:[^)(]+|\([^)(]*\))*\))*\)|\!\(\>(?:[^)(]+|\((?:[^)(]+|\([^)(]*\))*\))*\)/g;
+	let localEdges=dsl.match(declareEdgePattern);
+	let edgesDsl=dsl;
+	if(localEdges){
+		this.edgesArray=localEdges.concat(this.edgesArray);
+		edgesDsl=dsl.replace(declareEdgePattern,'>@$');
+		edgesDsl=edgesDsl.replace(/\!\>\@\$/g,'>!@$');	
+	}	
+	//capturing relations group b/w [] Parent only 
+	let relations=this.capturingGroups(edgesDsl);		
+	if(relations){
+		this.relationsArray=relations.concat(this.relationsArray);
+		for(var z in relations){
+			edgesDsl=edgesDsl.replace(relations[z],'#$');				
+		}			
+	}
+	//console.log('edgesDsl to padd getDslNodes>>>>>',edgesDsl);
+	this.getDslNodes(edgesDsl,type,groupStart,groupEnd,edgeStart,edgeEnd);
+}
+	
+ getDslNodes=(dsl,type,groupStart,groupEnd,edgeStart,edgeEnd)=>{
+	console.log('getDslNodes>>>>',dsl);
+	let dslArray=[];
+	let localDslNodes='';
+	let relations=false;
+	let edges=false;
+	let traversal=false;
+	dslArray = dsl.split('>');
+	if(type === 'relationalNode'){
+		traversal=(dsl.indexOf('#$') === -1 && dslArray.length>1 && dsl.indexOf('@$') === -1);
+	}
+	for(var i=0;i<dslArray.length;i++){
+		if(dslArray[i] !== ''){
+			if(dslArray[i] === '#$'){//RelationalNode
+				//relations to be enables
+				localDslNodes=this.relationsArray[0];
+				console.log(dslArray[i]+'<<<dslArray[i] localDslNodes>>>>>>>****>>>>',localDslNodes);
+				localDslNodes=this.stripLastCharacter(this.stripFirstCharacter(localDslNodes));
+				type='relationalNode';
+				this.relationsArray=this.relationsArray.slice(1,this.relationsArray.length);					
+				this.getDslRelationalNodes(localDslNodes,type);
+			}else if(dslArray[i].trim() === '@$' || dslArray[i].trim() === '!@$'){//EdgeNode
+			//edges should be enable
+				localDslNodes=this.edgesArray[0];
+				type='edgeNode'
+				localDslNodes=this.stripLastCharacter(localDslNodes);
+				if(localDslNodes.startsWith('!')){
+					localDslNodes=localDslNodes.substr(3);
+					type='negEdgeNode';
+				}else{
+					localDslNodes=localDslNodes.substr(2);
+					type='edgeNode';
+				}
+				this.edgesArray=this.edgesArray.slice(1,this.edgesArray.length);
+				this.getDslEdgeNodes(localDslNodes,type);
+			}
+			//node,traversal,relationalEdges
+			let x=i+1;				
+			if(dslArray[x] && dslArray[x] === '#$'){
+				relations=true;
+			}
+			if(dslArray[x] && dslArray[x] === '@$'){
+				edges=true;
+			}				
+			let tStart=(parseInt(i) === 0 && traversal)?true:false;
+			let tEnd=(parseInt(i) === dslArray.length-1 && traversal)?true:false;
+			if(i === dslArray.length-1){
+				if(type==='edgeNode' || type === 'negEdgeNode'){
+					edgeEnd=true;
+					edgeStart=(dslArray.length===1)?true:false;
+					groupStart=false;
+					groupEnd=false;
+				}else if(type==='relationalNode'){
+					edgeEnd=false;
+					edgeStart=false;							
+				}else{
+					groupStart=false;
+					groupEnd=false;
+					edgeEnd=false;
+					edgeStart=false;
+				}
+			}
+			if(!(dslArray[i] === '#$' || dslArray[i].trim() === '@$' || dslArray[i].trim() === '!@$')){					
+				dslArray[i]=dslArray[i].replace(/\,$/g,'').replace(/\]$/g,'').replace(/\>$/g,'').trim();
+				this.formDslObject(dslArray[i],type,groupStart,groupEnd,relations,traversal,tStart,tEnd,edges,edgeStart,edgeEnd);
+			}				
+		}			
+	}
+	console.log('<<formDslObject>>>>>',JSON.stringify(this.dslObject));
+}
+getDslEdgeNodes=(edgesDsl,type)=>{		
+	//space for future changes
+	this.contructDslNodes(edgesDsl,type,false,false,true,false);
+}
+getDslRelationalNodes=(relationDsl,type)=>{
+	console.log('getDslRelationalNodes>>>>>>>>>>>>',relationDsl)
+	//var dslRelationNodes=relationDsl.substring(relationDsl.indexOf('['),relationDsl.lastIndexOf(']')+1);
+	let dslRelationNodes=this.capturingGroups(relationDsl);
+	let dslRelations= relationDsl;
+	if(dslRelationNodes){
+		for(var z in dslRelationNodes){
+			dslRelations=dslRelations.replace(dslRelationNodes[z],'#$');
+		}
+		this.relationsArray=dslRelationNodes.concat(this.relationsArray);
+	}
+	let relationsList=dslRelations.replace(/\((?:[^)(]+|\((?:[^)(]+)\))*\)/g,'').replace(/\{(.*?)\}/g,'').trim('').replace(/\>\#\$/g,'').replace(/\>\@\$/g,'').replace(/\>\!\@\$/g,'').replace(/\!/g,'').split(',');
+	dslRelations=','+dslRelations+'&&';
+	let groupStart=false;
+	let groupEnd=false;		
+	//relationsList: have all Relations like node [node1>#$,node2,node3>node4]: possible to contain EdgeNodes,Traversal condition and inner relationNodes
+	for(var k in relationsList){
+		console.log(k+'relationsList>>>>**',relationsList);
+		if(parseInt(k)===0){
+			groupStart=true;
+			groupEnd=false;
+		}else if(parseInt(k) === relationsList.length-1){
+			groupStart=false;
+			groupEnd=true;
+		}else{
+			groupStart=false;
+			groupEnd=false;
+		}
+		if(relationsList.length === 1){
+			groupStart=true;
+			groupEnd=true;
+		}
+		var relationPattern='';
+		
+		console.log('dslRelations>>>>>>>>>>>>',dslRelations);
+		let pattern=relationsList[k]+"(.*?)>\\#\\$(?=\\,|\\&&)|"+relationsList[k]+"(.*?)>\\@\\$(?=\\,|\\&&)|"+relationsList[k]+"(.*?)>\\!\\@\\$(?=\\,|\\&&)";
+		console.log('pattern>>>>>',pattern);
+		let relationP1 = new RegExp(pattern, 'g');					
+		let findDslRelation=dslRelations.match(relationP1);
+		console.log('findDslRelation>>>>>>',findDslRelation);
+		if(findDslRelation){//dslRelations.indexOf(relationsList[k]+'>#') !==-1 || dslRelations.indexOf(relationsList[k]+'>@$') !==-1){
+			relationPattern="(?:[^-]"+relationsList[k].split('>')[0]+"(.*?)(?=\,[a-z]|&&))|"+"(?:[^-]"+relationsList[k].split('>')[0]+"(?=\,[a-z]|&&))";
+		}else if(dslRelations.indexOf(relationsList[k]+',#') !== -1){
+			relationPattern="(?:[^-]"+relationsList[k]+"(.*?)(?=\,#))|"+"(?:[^-]"+relationsList[k]+"(?=\,#))";
+		}else if(relationsList[k] !== '#$'){
+			relationPattern="(?:[^-|^>]"+relationsList[k]+"(.*?)(?=\,[a-z]|>|&&))|"+"(?:[^-|^>]"+relationsList[k]+"(?=\,[a-z]|>|&&))";
+		}
+		if(relationsList[k] !== '#$'){		
+			console.log(k+'for relationPattern>>>',relationPattern);
+			console.log(k+'for dslRelations>>>>',dslRelations);
+			let relationPatternExp = new RegExp(relationPattern, 'g');					
+			let dslRelationArray=dslRelations.match(relationPatternExp);
+			console.log(k+'for dslRelationArray>>>>',dslRelationArray);
+			if(dslRelationArray){
+				for(var j in dslRelationArray){	
+					console.log('dslRelationArray[j]>>>',dslRelationArray[j]);						
+					let dslRelationNode=null;					
+					dslRelationArray[j]= dslRelationArray[j].substr(1);
+					dslRelations=dslRelations.replace(dslRelationArray[j],'@');
+					console.log('groupStart>>>>>>>>>>',groupStart);
+					this.contructDslNodes(dslRelationArray[j],type,groupStart,groupEnd);						
+				}
+			}else{				
+				var relationPatternArray=relationsList[k].split('>');
+				relationPattern=''; 
+				for(var x=0;x<relationPatternArray.length;x++){
+					if(x === 0){
+						relationPattern=relationPatternArray[x]+'(.*?)';
+					}else{
+						relationPattern=relationPattern+'>'+relationPatternArray[x]+'(.*?)';
+						if(x===relationPatternArray.length-1){
+							relationPattern=relationPattern+'(?=\,[a-z]|&&)';
+						}						
+					}
+				}
+				console.log('relationPattern>>>>>>',relationPattern);
+				relationPatternExp = new RegExp(relationPattern, 'g');
+				dslRelationArray=dslRelations.match(relationPatternExp);
+				if(dslRelationArray){
+					dslRelations=dslRelations.replace(dslRelationArray[0],'@');
+					console.log('dslRelationArray!!!!!!!!!!!!!>>>>>',dslRelationArray);
+					this.contructDslNodes(dslRelationArray[0],type,groupStart,groupEnd);
+				}				
+			}			
+		}else{
+			let localDslNodes=this.relationsArray[0];
+			relationsList[k]=this.stripLastCharacter(this.stripFirstCharacter(localDslNodes));
+			this.relationsArray=this.relationsArray.slice(1,this.relationsArray.length);
+			console.log('relationsList[k]>***>>>',relationsList[k]);
+			//dslRelations=dslRelations.replace(dslRelationArray[j],'@');
+			this.contructDslNodes(relationsList[k],type,groupStart,groupEnd);
+			
+		}				
+	}
+}
+formDslObject=(dslArray,type,groupStart,groupEnd,relationState,traversal,tStart,tEnd,edges,eStart,eEnd,id)=>{
+	let nodeType=dslArray.replace(/\((?:[^)(]+|\((?:[^)(]+)\))*\)/g,'').replace(/\{(.*?)\}/g,'').replace(/\!/g,'').trim('');
+	let props=dslArray.match(/\{(.*?)\}/g);
+	let propValues=dslArray.match(/\((?:[^)(]+|\((?:[^)(]+)\))*\)|\!\((?:[^)(]+|\((?:[^)(]+)\))*\)/g);
+	var entries=[]
+	var entry = {};
+	entry.type = type;
+	entry.relationsStart = groupStart;
+	entry.relationsEnd= groupEnd;
+	entry.relations=relationState;
+	entry.nodeName = nodeType;
+	entry.props=props;
+	entry.traversal=traversal;
+	entry.traversalStart=tStart;
+	entry.traversalEnd=tEnd;
+	entry.edgeEnable=(edges)?edges:false;
+	entry.edgeStart=(eStart)?eStart:false;
+	entry.edgeEnd=(eEnd)?eEnd:false;
+	entry.values=propValues;
+	entries.push(entry);
+	let entityId=nodeType.replace(/\*/g,'');
+	if(!this.nodeTypeArray.includes(entityId)){
+		this.nodeTypeArray.push(entityId);
+		this.dslObject[entityId] = entries;
+	}else{
+		let newNodeType='';
+		let repeatMode=true;
+		for(var n=1;n<=this.nodeTypeArray.length;n++){
+			if(!this.nodeTypeArray.includes(entityId+'-'+n) && repeatMode){
+				newNodeType=entityId+'-'+n;	
+				repeatMode=false;
+			}
+		}
+		this.nodeTypeArray.push(newNodeType);
+		this.dslObject[newNodeType] = entries;
+	}		
+	console.log('nodeTypeArray>>>>',this.nodeTypeArray);
+	console.log('this.dslObject>>>>',this.dslObject);	
+}
+formFilterValues=(propValues)=>{
+	let templateQuery='';
+	let negQuery='';	
+	for(var k = 0; k < propValues.length; k++){
+		if(propValues[k].indexOf('!') !== -1){
+			negQuery += propValues[k];
+		}else{
+			templateQuery += propValues[k];
+		}		
+	}
+	if(negQuery!==''){
+		templateQuery+=negQuery;
+	}
+	console.log('templateQuery>>>>>>>>>>>>',templateQuery);
+	return templateQuery;
+}
+replaceFilterValues=(propValues,entries)=>{
+	console.log(propValues+'<<<propValues>>>>>',entries);
+	let templateQuery='';
+	let negQuery='';
+	let count=1;
+	for(var k = 0; k < propValues.length; k++){
+		let templatekey=(entries)?entries[k].templateKey+1:count;
+		if(propValues[k].indexOf('!') !== -1){
+			negQuery += "!($" + templatekey + ")";
+		}else{
+			templateQuery += "($" + templatekey + ")";
+		}	
+		count++;	
+	}
+	if(negQuery!==''){
+		templateQuery+=negQuery;
+	}
+	console.log('templateQuery>>>>>>>>>>>>',templateQuery);
+	return templateQuery;
+}
+formTemplateFilterValues=(propvalues,nodeName,nodeId,idx)=>{
+	let filterTemplateHeader = {};
+	let filterEntries=[];
+	var spaceRemoverPattern=/\,\s/g;
+	var errorOccurred = false;
+	var filterTypeDisplayArray = this.state.filterTypeDisplayList;
+	let filterTypeDisplay= {'default':'Filter Type'};
+	if(!filterTypeDisplayArray[idx] || filterTypeDisplayArray[idx] === undefined){
+		filterTypeDisplayArray.push(filterTypeDisplay);
+	}
+	var entries = [];
+	var filterTypeEntries =[];
+	var selectedProp=[];
+	if(propvalues){
+		for(var i = 0; i < propvalues.length; i++){
+			console.log('propvalues['+i+']>>>>',propvalues[i]);
+			var entry = {};
+			let propVal = '';
+			if(propvalues[i].indexOf('!') !==-1){
+				propVal=this.stripLastCharacter(this.stripFirstTwoCharacter(propvalues[i].trim()));
+			}else{
+				propVal=this.stripLastCharacter(this.stripFirstCharacter(propvalues[i].trim()));
+			}				
+			propVal = propVal.replace(spaceRemoverPattern,',');
+			//console.log('propVal>>>>>>>>>>>',propVal);			
+			var matchesList = propVal.split(/',|\),/g)
+			//console.log('matchesList>>>>',matchesList);									
+			let type='';
+			let value='';
+			let errorFound=true;
+			let entryState=true;
+			for(var n=0;n<matchesList.length;n++){
+				let scenario=true;
+				let found=true;
+				if(n==0){
+					entry.name = this.stripFirstCharacter(matchesList[n].trim());
+					selectedProp.push(this.stripFirstCharacter(matchesList[n].trim()));
+				}else{
+					let obj={};
+					var lastChar=matchesList[n].charAt(matchesList[n].length-1);							
+					for(var x in filterTypeList){
+						if(found){
+							let pattern= new RegExp('^'+filterTypeList[x]+'\\((.*?)', 'g');	
+							var filterExist=matchesList[n].match(pattern);
+							//console.log(matchesList[n]+'filterExist>>>>>',filterExist);
+							if(filterExist){
+								var nodevalue='';
+								if(lastChar===')'){
+									nodevalue=matchesList[n].replace(filterTypeList[x],'').replace(/\(\'/,'').replace(/\'\)/,'');
+								}else{
+									nodevalue=this.stripLastCharacter(matchesList[n].replace(filterTypeList[x],'').replace(/\(\'/,''));
+								}
+								//console.log('before srtip>>>',nodevalue);					
+								type=(type==='')?filterTypeList[x]:type+'^'+filterTypeList[x];
+								value=(value==='')?nodevalue:value+'^'+nodevalue;
+								scenario=false;
+								found=false;
+								errorFound=false;
+								entryState=false;					
+								obj[entry.templateKey+1] = filterTypeList[x];
+								filterTypeEntries.push(obj);
+								console.log('filterTypeDisplayArray....>*',filterTypeEntries);					
+							}
+						}			
+						console.log(found+'found>>>>>>>>>>>>',value);
+					}
+					if(scenario){
+						console.log('inside else');
+						type=(type==='')?'EQ':type+'^'+'EQ';						
+						let val=this.stripFirstCharacter(matchesList[n].trim());
+						if(lastChar == '\''){
+							val=this.stripLastCharacter(val);
+						}
+						value=(value==='')?val:value+'^'+val;
+						entryState=false;
+						found=false;
+						errorFound=false;
+					}			
+				}
+			}
+			if(!entryState){
+				entry.type =type;
+				entry.value =  value;
+				entry.templateKey = i;
+				entries.push(entry);		
+			}
+			if(errorFound && !errorOccurred){
+				errorOccurred=true;
+			}
+		}			
+	}
+	console.log('Initial Filtered Template Entries ' + JSON.stringify(entries));
+	//nodeTypeOfDsl.push(nodeTypes[z]);
+	let obj = {};
+	obj[nodeId] = entries;
+	filterTemplateHeader[nodeId]= {};
+	filterTemplateHeader[nodeId]['enableAnd'] = true;
+	filterTemplateHeader[nodeId]['propName'] = this.state.filterDisplay;
+	filterTemplateHeader[nodeId]['selectedProp']=selectedProp;
+	filterEntries.push(obj)
+	filterTypeDisplayArray[idx][nodeId] = filterTypeEntries;
+	let dslObject=this.dslObjectList[idx];
+	if(dslObject){
+		dslObject[nodeId]['filterTemplateHeader']= filterTemplateHeader;
+		dslObject[nodeId]['filterEntries']=filterEntries;
+		dslObject[nodeId]['errorOccurred']=errorOccurred;
+		this.dslObjectList[idx]=dslObject;
+	}else{
+		this.dslObject[nodeId]['filterTemplateHeader']= filterTemplateHeader;
+		this.dslObject[nodeId]['filterEntries']=filterEntries
+		this.dslObject[nodeId]['errorOccurred']=errorOccurred;
+	}		
+  }
+  
+  onAssociatedNodesCheckbox(e) {
+      var cbValue = false;
+      if (e.target.checked) {
+        cbValue = true;
+      }else {
+        cbValue = false;
+      }
+      this.setState({ associatedNodesEnabled: cbValue });
+  }
+  onAggregateCheckbox(e) {
+      var cbValue = false;
+      if (e.target.checked) {
+        cbValue = true;
+        this.setState({associatedNodesEnabled: false});
+      }else {
+        cbValue = false;
+      }
+      this.setState({ isAggregateChecked: cbValue });
+  }
+  onPublicCheckbox(e) {
+      var cbValue = false;
+      if (e.target.checked) {
+        cbValue = true;
+        this.setState({ isPublicChecked: cbValue, isCommunitySharedChecked: false });
+      }else {
+        cbValue = false;
+        this.setState({ isPublicChecked: cbValue });
+      }
+  }
+  onMergedTabsCheckbox(e){
+	var cbValue = false;
+	if (e.target.checked) {
+	  cbValue = true;
+	  this.setState({ isMergedTabsChecked: cbValue});
+	}else {
+	  cbValue = false;
+	  this.setState({ isMergedTabsChecked: cbValue });
+	}
+  }
+  onGenerateEmailButton(){	
+	let path='email-bulk-dsl-to-excel';
+	this.generatebulkDslToExcel(path,true);	
+  }
+  onCommunitySharedCheckbox(e) {
+      var cbValue = false;
+      if (e.target.checked) {
+        cbValue = true;
+      }else {
+        cbValue = false;
+      }
+      this.setState({ isCommunitySharedChecked: cbValue });
+  }
+  onDslConfigCheckbox(e, key) {
+        var cbValue = false;
+        var staticTemplateFilters = this.state.staticTemplateFilters;
+        if (e.target.checked) {
+          cbValue = true;
+          staticTemplateFilters = staticTemplateFilters.filter(e => e !== key);
+        }else {
+          cbValue = false;
+          staticTemplateFilters.push(key);
+        }
+        this.setState({ staticTemplateFilters: staticTemplateFilters });
+    }
+  handleOnFilter = (columnFilter,value) =>{
+	console.log('handleOnFilter to Re-render', this.state.columnFilter);
+	var applyState = true;
+	if(value === ''){
+		for(var i= 0; i < columnFilter.length; i++){
+			var x = columnFilter[i];		
+			console.log('handleOnfilter ColumnFilterList.....',Object.keys(x));
+			Object.keys(x).forEach(function(key){
+				if(x[key] !==''){
+					applyState=false;
+				}
+			});
+		}
+	}else{
+		applyState = false;
+	}
+	
+    this.setState({columnFilter : columnFilter,reRender:true,disableFilter: applyState});
+  }
+  
+  alterDslQueryByRemoveSpaces = (dslQuery) =>{
+	    var p2='';
+		if((dslQuery.indexOf('(>') !==-1) || (dslQuery.indexOf('!(>') !==-1)){
+			p2=/\((?:[^>)(]|\((?:[^)(]+)\))*\)/g;
+		}
+		else{
+			p2 = /\((?:[^)(]+|\((?:[^)(]+)\))*\)/g;
+		}
+		var prop = dslQuery.match(p2);
+		var spacepattern = /\s(?!(^)]*\()/g;		
+		var newDslQuery='';
+		if(prop && prop.length > 0){
+			var x = dslQuery.replace(p2,'{*$}');
+			var matchStr = x.replace(spacepattern,'');			
+			var propArray=matchStr.split('{*$}');			
+			for(var i in prop){
+				newDslQuery=newDslQuery+propArray[i]+prop[i];
+			}
+			newDslQuery = newDslQuery + propArray[propArray.length-1];
+		}else{
+			newDslQuery = dslQuery.replace(spacepattern,'');
+		}
+		newDslQuery = newDslQuery.trim();
+		console.log('New DSl Query after alterDslQueryByRemoveSpaces>>>>>>',newDslQuery);
+		return newDslQuery;
+  }
+ 
+  isTableFilterForAggregation = (columnFilterList,columnsList) => {
+	console.log('isTableFilterForAggregation:aggregateTableFilterColumns>>>>>>',this.state.aggregateTableFilterColumns);
+	//console.log('isTableFilterForAggregation:columnFilterList>>>>>>>>',columnFilterList);
+	var nodeTypeArray = [];
+	var columnsList = {};
+	var filterMessage = {};
+	var j = 0;	
+	for(var i= 0; i < columnFilterList.length; i++){
+		var x = columnFilterList[i];		
+		console.log('isTableFilterForAggregation:Aggregate columnFilterList.....',Object.keys(x));
+		var  propValue = '';
+		Object.keys(x).forEach((key)=>{
+			var grabNode = key.split("|");
+			let indx=false;
+			let index='';
+			if(nodeTypeArray.indexOf(grabNode[0]) === -1){
+				nodeTypeArray.push(grabNode[0]);
+				j = j + 1;
+				indx=true;
+				index=j-1;
+			}else{
+				index=nodeTypeArray.indexOf(grabNode[0]);
+			}
+			
+			if(!columnsList[nodeTypeArray[index]]){
+				columnsList[nodeTypeArray[index]] = [];
+			}
+			if(!filterMessage[nodeTypeArray[index]]){
+				filterMessage[nodeTypeArray[index]]=[];
+			}
+			let col='';
+			if(this.tableFilterAliasColumns[grabNode[0]][0] && this.tableFilterAliasColumns[grabNode[0]][0][grabNode[1]]){
+				col=this.tableFilterAliasColumns[grabNode[0]][0][grabNode[1]];
+			}else{
+				col=grabNode[1];
+			}
+			if(columnsList[nodeTypeArray[index]].indexOf(col) === -1){
+				columnsList[nodeTypeArray[index]].push(col);
+				if(x[key] != ''){
+					let filterMsg = '';
+					if(this.state.enableRealTime){
+						filterMsg='(\''+col +'\'' + ',' + TABULAR_FILTER_TYPE+'(\'' + x[key]+ '\'))';
+					}else{
+						filterMsg='(\''+col +'\'' + ',' + '\'' + x[key] + '\')';
+					}	
+					filterMessage[nodeTypeArray[j-1]].push(filterMsg);
+				}
+			}
+			propValue=x[key];			
+		});					
+	}
+	console.log('isTableFilterForAggregation:nodeTypeArray><><><>',nodeTypeArray);	
+	console.log('isTableFilterForAggregation:columnsList<><><>',columnsList);
+	console.log('isTableFilterForAggregation:filterMessage>>>>>>>>',filterMessage);
+	let dslQuery = this.state.value;
+	var limitPattern = /limit[\s]\d+|limit\d+/ig
+	var limitkey = dslQuery.match(limitPattern);
+	if(limitkey){
+		dslQuery = dslQuery.replace(limitkey[limitkey.length-1],'').trim();
+	}
+	dslQuery = this.alterDslQueryByRemoveSpaces(dslQuery);
+	//New adding
+	this.dslObject={};
+	this.nodeTypeArray=[];
+	//create placeholders for NodeTypes with Propand Propvalues
+	this.tempDslQuery=this.formTempDslQuery(dslQuery);
+	//Preparing Json Object to render into Placeholder		
+	this.contructDslNodes(dslQuery,'node',false,false,false,false);
+	console.log('dslQuerydsl>>>>>>>>>>>>>',dslQuery);		
+	//adding	
+	Object.keys(this.dslObject).map((nodekey)=>{		
+		let nodeNo=parseInt(nodekey.substr(nodekey.length-2,nodekey.length-1).replace(/\-/g,''));
+		console.log('nodeNo>>>>>>>>>>>>>>',nodeNo);
+		let keyact=isNaN(nodeNo);
+		let nodeType=nodekey;
+		let actKey=nodekey.split('-');
+		console.log(nodeType+'>>>>nodeType<<<<nodeType>>>>',actKey);
+		if(!keyact){
+			actKey.splice(actKey.length-1,1);
+			nodeType=actKey.join('-')+nodeNo;
+		}
+		if(!nodeTypeArray.includes(nodeType) && nodeTypeArray.includes(actKey.join('-'))){
+			nodeType=actKey.join('-');
+		}
+		console.log('nodeType>>>>>>>>>>',nodeType);
+		var columns = columnsList[nodeType];
+		var filterMsg= filterMessage[nodeType];
+		console.log('CustomDsl js filterMsg:',filterMsg);
+		if(nodeType && this.dslObject[nodekey][0]){
+			if(filterMsg && filterMsg.length>0){
+				for(var i=0;i<filterMsg.length;i++){
+					let values=this.dslObject[nodekey][0]['values'];
+					let nonExist=true
+					let columnCompare=filterMsg[i].split(',')[0];
+					if(values && values.length>0){
+						for(var n=0;n<values.length;n++){
+							console.log('values[n].indexOf(columnCompare)>>>>',values[n].indexOf(columnCompare));
+							if(values[n].indexOf(columnCompare) !==-1 && values[n].indexOf('!'+columnCompare) ===-1){
+								values[n]=filterMsg[i];
+								nonExist=false;
+							}
+						}
+						if(nonExist){
+							this.dslObject[nodekey][0]['values'].push(filterMsg[i]);	
+						}else{
+							this.dslObject[nodekey][0]['values']=values;	
+						}
+					}else{
+						this.dslObject[nodekey][0]['values']=[];
+						this.dslObject[nodekey][0]['values'].push(filterMsg[i]);
+					}
+				}
+			}
+		}
+	});
+	this.dslObjectList =[];
+	this.dslObjectList.push(this.dslObject);
+	//Query to replace placeholders with JSON Object values depends on Flow either SavedQuery or TableFilters	
+	let newDslQuery=this.formTemplateQuery('tableFilter');
+	newDslQuery=newDslQuery.replace(/\'(as)\'/g,'\' as \'').replace(/\(\'\s(as)\s\'\)/g,'(\'as\')');
+	if(limitkey){
+		newDslQuery+=' '+limitkey[limitkey.length-1];
+	}
+	console.log('query>>>>>>>>>>>>>>>>>>>>>****',newDslQuery);
+	this.setState({value : newDslQuery, viewName: "CellLayout", aggregateActivePage:1}, function () { this.formQueryString(false,false,false); }.bind(this));
+	//End	
+  }
+
+  isTableFilterApply = (columnFilterList,nodeTypeList,columnsList,aliasColumnList) => {
+    console.log('CustomDSL js ....columnFilterList:',columnFilterList);
+	console.log('CustomDSL js .... nodeTypeList:',nodeTypeList);
+	var nodeTypeListArray = [];
+	if(!Array.isArray(nodeTypeList)){
+		nodeTypeListArray.push(nodeTypeList);
+		nodeTypeList = nodeTypeListArray;
+	}
+	console.log('CustomDSL js .... nodeTypeList After set:',nodeTypeList);
+	var dslQuery = this.state.value;
+	var limitPattern = /limit[\s]\d+|limit\d+/ig
+	var limitkey = dslQuery.match(limitPattern);
+	if(limitkey){
+		dslQuery = dslQuery.replace(limitkey[limitkey.length-1],'').trim();
+	}
+	dslQuery = this.alterDslQueryByRemoveSpaces(dslQuery);
+	//New adding
+	this.dslObject={};
+	this.nodeTypeArray=[];
+	//create placeholders for NodeTypes with Propand Propvalues
+	this.tempDslQuery=this.formTempDslQuery(dslQuery);
+	//Preparinga Json Object to render into Placeholder		
+	this.contructDslNodes(dslQuery,'node',false,false,false,false);
+	console.log('dslQuerydsl>>>>>>>>>>>>>',dslQuery);		
+	//adding	
+	Object.keys(this.dslObject).map((nodekey)=>{
+		var nodeType=this.dslObject[nodekey][0]['nodeName'].replace(/\*/g,'');
+		console.log('nodeType>>>>>>>>>>',nodeType);
+		var columnFilter = (columnFilterList[nodeType])?columnFilterList[nodeType][0]:[];
+		var aliasColumnFilters = (aliasColumnList[nodeType])?aliasColumnList[nodeType][0]:[];
+		console.log('CustomDsl js columnFilter:',columnFilter);
+		var columns = columnsList[nodeType];
+		console.log('CustomDsl js Columns:',columns);
+		if(columns && columnFilter.length>0){
+			for(var i=0;i<columns.length;i++){
+				console.log(columnFilter[i]+'<<<<<<columnFilter[i]columns[i].value>>>>',columns[i]);
+				var colAliasFilter='';
+				for(var z=0;z<aliasColumnFilters.length;z++){
+					if(aliasColumnFilters[z][columns[i].value]){
+						colAliasFilter=aliasColumnFilters[z][columns[i].value];
+					}				
+				}		
+				var colFilterValue = columnFilter[i][columns[i].value];      
+				if(colFilterValue != ""){        
+					let filterMsg = '';
+					let col=(colAliasFilter)?colAliasFilter:columns[i].value;
+					if(this.state.enableRealTime){
+						filterMsg='(\''+col +'\'' + ',' + TABULAR_FILTER_TYPE+'(\'' + colFilterValue + '\'))';
+					}else{
+						filterMsg='(\''+col +'\'' + ',' +'\'' + colFilterValue + '\')';
+					}				
+					let values=this.dslObject[nodekey][0]['values'];
+					let nonExist=true;
+					if(values && values.length>0){
+						for(var n=0;n<values.length;n++){
+							if(values[n].indexOf('(\''+col+'\'') !==-1 && values[n].indexOf('!(\''+col+'\'') ===-1){
+								values[n]=filterMsg;
+								nonExist=false;
+							}
+						}
+						if(nonExist){
+							this.dslObject[nodekey][0]['values'].push(filterMsg);	
+						}else{
+							this.dslObject[nodekey][0]['values']=values;	
+						}
+					}else{
+						this.dslObject[nodekey][0]['values']=[];
+						this.dslObject[nodekey][0]['values'].push(filterMsg);
+					}
+				}
+			}
+		}
+	});
+	//Query to replace placeholders with JSON Object values depends on Flow either SavedQuery or TableFilters	
+	this.dslObjectList =[];
+	this.dslObjectList.push(this.dslObject);
+	let newDslQuery=this.formTemplateQuery('tableFilter');
+	newDslQuery=newDslQuery.replace(/\'(as)\'/g,'\' as \'').replace(/\(\'\s(as)\s\'\)/g,'(\'as\')');
+	if(limitkey){
+		newDslQuery+=' '+limitkey[limitkey.length-1];
+	}
+	console.log('query>>>>>>>>>>>>>>>>>>>>>****',newDslQuery);
+	this.setState({value : newDslQuery, viewName: "CellLayout", activePage:1}, function () { this.formQueryString(false,false,false); }.bind(this));
+	//End
+  }
+  
+  onTargetMenuOfFilterTypes = (listName,id) => {
+	console.log('onTargetMenuOfFilterTypes>>>>',listName);
+	let idArray=id.split('#');
+	let key=idArray[0];
+	let templateKey=parseInt(idArray[1]);
+	let filterTypeIndex = parseInt(idArray[2]);
+	let idx= parseInt(idArray[3]);
+	var filterTypeDisplayList = this.state.filterTypeDisplayList;	
+	var filterTypeDisplayArray = filterTypeDisplayList[idx];
+	Object.keys(filterTypeDisplayArray).map((entry) => {
+		if(entry === key){
+			console.log('filterTypeDisplayArray.entry....',filterTypeDisplayArray[entry]);
+			if(filterTypeDisplayArray[entry][templateKey]){
+				filterTypeDisplayArray[key][templateKey] = listName;
+			}else{
+				let obj={};
+				obj[templateKey+1]=listName;
+				filterTypeDisplayArray[key].push(obj);
+			}
+		}
+	});	
+	let filterTemplateEntriesList =	this.state.filterTemplateEntriesList;
+	var filterTemplateEntriesArray = filterTemplateEntriesList[idx];	
+	Object.keys(filterTemplateEntriesArray).map((entry)=>{
+		if(filterTemplateEntriesArray[entry][key]){
+			Object.keys(filterTemplateEntriesArray[entry][key]).map((ind) =>{
+				if(filterTemplateEntriesArray[entry][key][ind].templateKey === templateKey){
+					let type=filterTemplateEntriesArray[entry][key][ind].type.split('^');
+					if(type[filterTypeIndex]){
+						type[filterTypeIndex]=listName
+					}else{
+						type.push(listName);
+					}
+					filterTemplateEntriesArray[entry][key][ind].type=type.join('^');
+				}
+			})
+		}
+	});
+	console.log('onTargetMenuOfFilterTypes filterTemplateEntriesArray>>>',filterTemplateEntriesArray);
+	filterTemplateEntriesList[idx]=filterTemplateEntriesArray;
+	filterTypeDisplayList[idx]=filterTypeDisplayArray;
+	this.setState({filterTypeDisplayList:filterTypeDisplayList,filterTemplateEntriesList:filterTemplateEntriesList});
+  }
+  filterTags = (type,templateKey,key,idx) =>{
+	console.log(key+'<<<filterTags>>>>>*',type);
+	let filterType = (type === '')? this.state.filterTypeDisplayList[idx]['default']:type;
+	let filterTag = '';
+	if(APERTURE_SERVICE && this.state.enableRealTime){
+		console.log(filterType+'before passing Filter>*',this.state);
+		let filterTypesArray=filterType.split('^');	
+		let filters = Object.keys(filterTypesArray).map((index)=>{
+						return  <div style={{margin:'0px 0px 0px 5px'}}>
+									<label>
+										<FilterTypes param={this.state}
+													selectedFilter={filterTypesArray[index]}
+													id={key+'#'+templateKey+'#'+index+'#'+idx}
+													onMenuSelect={this.onTargetMenuOfFilterTypes} />
+									</label>
+								</div>
+						});
+		filterTag=<td width='20%'>{filters}</td>;
+	}
+	return filterTag;
+  }
+  populateFilteredColumnOptions = (nodekey,indx) =>{
+	let keyact=isNaN(parseInt(nodekey.substr(nodekey.length-2,nodekey.length-1)));
+	let actColumns ='';
+	if(keyact){
+		actColumns =this.populateColumnOptions(nodekey);//this.populateColumnOptions(key);
+	}else{
+		let actKey=nodekey.split('-');
+		actKey.splice(actKey.length-1,1);
+		actColumns =this.populateColumnOptions(actKey.join('-'));
+	}	 
+	let filterTemplateEntries=this.state.filterTemplateEntriesList[indx];
+	let filterTemplateHeader=this.state.filterTemplateHeaderList[indx];
+	let selectedColumns=[];
+	Object.keys(filterTemplateEntries).map((index) => {
+		let filterTemplateEntry = filterTemplateEntries[index];
+		Object.keys(filterTemplateEntry).map((key) =>{
+			let filterTemplateEntryKey=filterTemplateEntry[key];
+			if(nodekey === key){
+				Object.keys(filterTemplateEntryKey).sort().map((entryKey, entry) => {
+					if(filterTemplateEntryKey[entryKey].name !==''){
+						let index=actColumns.indexOf(filterTemplateEntryKey[entryKey].name);
+						actColumns.splice(index,1);
+						selectedColumns.push(filterTemplateEntryKey[entryKey].name);				
+					}
+				});
+				filterTemplateHeader[key]['selectedProp']=selectedColumns;
+			}			
+		});
+	});
+	return actColumns;
+  };
+  /**AND OR functionality */
+  addAndTemplate = (key,idx) =>{
+	console.log('addAndTemplate:key',key);
+	let templateEntriesList = this.state.filterTemplateEntriesList;
+	let filterTemplateHeaderList= this.state.filterTemplateHeaderList;
+	let templateEntries = this.state.filterTemplateEntriesList[idx];
+	let filterTemplateHeader= this.state.filterTemplateHeaderList[idx];
+	Object.keys(templateEntries).map((index) =>{
+		Object.keys(templateEntries[index]).map((entryKey)=>{
+			if(entryKey === key){
+				let length=templateEntries[index][entryKey].length;
+				let tempKey = (length===0)?length:templateEntries[index][entryKey][length-1].templateKey+1;
+				let obj ={}
+				obj['name']='';
+				obj['value']='';
+				obj['type']=(this.state.enableRealTime)?'EQ':'';
+				obj['templateKey']=tempKey;
+				obj['addition']=true;
+				templateEntries[index][entryKey].push(obj);
+				//templateEntries[index][entryKey]['enableAnd']=false;
+				filterTemplateHeader[key]['enableAnd'] = false;
+				filterTemplateHeader[key]['propName'] = this.state.filterDisplay;
+			}
+		});
+	});
+	templateEntriesList[idx]=templateEntries;
+	filterTemplateHeaderList[idx]=filterTemplateHeader;
+	this.setState({filterTemplateHeaderList:filterTemplateHeaderList,filterTemplateEntriesList:templateEntriesList});
+  }
+  addOrTemplate = (key,name,templateKey,idx) =>{
+	console.log('addOrTemplate: key',key);
+	let templateEntriesList = this.state.filterTemplateEntriesList;
+	let templateEntries = templateEntriesList[idx];
+	Object.keys(templateEntries).map((index) =>{
+		Object.keys(templateEntries[index]).map((entryKey)=>{
+			let templateEntry=templateEntries[index][entryKey];
+			if(entryKey === key){
+				Object.keys(templateEntry).map((entry)=>{
+					if(templateEntry[entry].templateKey === templateKey){
+						let value = templateEntry[entry].value;
+						let type = templateEntry[entry].type;
+						templateEntry[entry].value=value+'^';
+						let fType=(this.state.enableRealTime)?'EQ':'';
+						templateEntry[entry].type=type+'^'+fType;
+						templateEntry[entry].name = name;
+					}
+				})
+			}
+		});
+	});
+	console.log('addOrTemplate templateEntries>>>>',templateEntries);
+	templateEntriesList[idx]=templateEntries;
+	this.setState({filterTemplateEntriesList:templateEntriesList});
+  }
+  deleteOrTemplate = (key,templatekey,id,idx) =>{
+	console.log('deleteOrTemplate');
+	let templateEntriesList = this.state.filterTemplateEntriesList;
+	let templateEntries = templateEntriesList[idx];
+	let delIndx=parseInt(id.split('-')[1]);
+	Object.keys(templateEntries).map((index) =>{
+		if(templateEntries[index][key]){
+			Object.keys(templateEntries[index][key]).map((i)=>{
+				if(templateEntries[index][key][i].templateKey===templatekey){
+					let valueArray = templateEntries[index][key][i].value.split('^');
+					let typeArray = templateEntries[index][key][i].type.split('^');
+					valueArray.splice(delIndx,1);
+					typeArray.splice(delIndx,1)
+					console.log('valueArray>>>>>>',valueArray);
+					templateEntries[index][key][i].value=valueArray.join('^');
+					templateEntries[index][key][i].type=typeArray.join('^');
+				}
+			})			
+		}		
+	});
+	console.log('deleteOrTemplate templateEntries>>>>',templateEntries);
+	templateEntriesList[idx]=templateEntries;
+	this.setState({filterTemplateEntriesList:templateEntriesList});
+  }
+  updatePropertyFilter = (listName,idkey) =>{
+	console.log('updatePropertyFilter:',listName)
+	let keys=idkey.split('#');
+	let key=keys[0];
+	let idx=parseInt(keys[2]);
+	let templateKey=parseInt(keys[1]);
+	let filterTemplateHeaderList = this.state.filterTemplateHeaderList;
+	let filterTemplateHeader= filterTemplateHeaderList[idx];
+	var filterTemplateEntriesList = this.state.filterTemplateEntriesList;
+	var filterMap = filterTemplateEntriesList[idx];	  
+	filterTemplateHeader[key]['propName']=listName;
+	//this.setState({filterTemplateHeader:filterTemplateHeader});	
+	let status=false;
+	Object.keys(filterMap).forEach((index) =>{
+		if(filterMap[index][key]){
+			Object.keys(filterMap[index][key]).forEach((i)=>{
+				if(filterMap[index][key][i].templateKey === templateKey){
+					if(filterMap[index][key][i].name === 'ERROR'){
+						filterMap[index][key][i].name= listName;									
+						let selectedProp=[];
+						console.log('filterTemplateHeader[key][selectedProp]>>>>',filterTemplateHeader[key]['selectedProp']);
+						if(filterTemplateHeader[key]['selectedProp']){
+							selectedProp=filterTemplateHeader[key]['selectedProp'];
+							let indSelect= selectedProp.indexOf(listName);
+							if(indSelect !== -1){
+								selectedProp=selectedProp.splice(indSelect,1);
+								filterTemplateHeader[key]['selectedProp']=selectedProp;
+							}					
+						}
+						filterTemplateHeader[key]['enableAnd'] = true;
+						console.log('ERRROOR CONDITION HANDLING!!!!');
+						this.templateErrorList[idx].pop();
+						this.updateSavedQueryTemplate('add',key,templateKey,filterMap,filterTemplateHeader,idx);
+					}else{
+						console.log('Regular Scenario>>>>>');
+						filterTemplateHeaderList[idx]=filterTemplateHeader;
+						this.setState({filterTemplateHeaderList:filterTemplateHeaderList});
+					}
+				}
+			})
+		}
+	});
+  };
+  /** */
+  prepareDownloadRangeModel = () =>{
+	let downloadExcelsFunc= this.getAllExcels;
+	if(this.state.isAggregate){
+		downloadExcelsFunc=this.downloadAllAggregate;
+	}
+    let downloadRangeModel = (this.state.showDownloadResultsModal)? <DownloadRangeModel 
+              showDownloadResultsModal={this.state.showDownloadResultsModal}
+              totalPages={this.state.totalPages}
+              totalResults={this.state.totalResults}
+              triggerDownload={downloadExcelsFunc}
+              errorDownloadResults={this.state.errorDownloadResults}
+              downloadErrorMsg={this.state.downloadErrorMsg}
+              triggerClose={this.closeDownloadResults}
+              enableModelBusyFeedback={this.state.enableModelBusyFeedback}
+          /> : '';
+    return downloadRangeModel;
+  }
+  toggleRealTimeAnalysisCallback=(checked)=>{
+	console.log('toggleRealTimeAnalysisCallback>>>>',checked);
+	sessionStorage.setItem(ENVIRONMENT + 'ENABLE_ANALYSIS', !checked);	
+	TABULAR_FILTER_TYPE=(APERTURE_SERVICE && !checked)?'CONTAINS':'=';
+	this.baseState.enableRealTime=!checked;
+	this.baseState.header='';	
+	this.baseState.templateQuery='';
+	this.baseState.filterTemplateEntries=[];
+	this.baseState.filterTemplateHeader=[];
+	this.baseState.filterTemplateError=false;
+	this.baseState.nodeTypeOfDslTemplate=[];
+	this.baseState.filterTemplateEntriesList=[];
+	this.baseState.filterTemplateHeaderList=[];
+	this.baseState.filterTemplateErrorList=[];
+	this.baseState.nodeTypeOfDslTemplateList=[];
+	this.baseState.templateQueryList=[];
+	this.baseState.valueList=[];
+	this.dslObject={};
+	this.nodeTypeArray=[];
+	this.dslObjectList=[];
+	this.nodeTypeArrayList=[];
+	this.edgesArray=[];
+	this.relationsArray=[];
+	this.tempDslQuery='';
+	this.tempDslQueryList=[];
+	this.templateError=[];
+	this.templateErrorList={};
+	this.setState({...this.baseState},()=>{this.buildDynamicByoq();});	
+  }
+  templateheaderSaveQuery = (id)=>{
+	console.log('templateheaderSaveQuery>>>>>>>>>>>>>',id);
+	let templateSavedQuery = '';
+	let entityKeyAddition = 1;
+	let templateheaderSaveQuery = '';
+	let filterTemplateHeaderList = this.state.filterTemplateHeaderList;
+	//templateheaderSaveQuery=Object.keys(this.state.filterTemplateEntriesList).map((id)=>{
+		//let tempheaderSavedQuery=''
+		if(this.state.filterTemplateEntriesList[id].length > 0 && !this.state.filterTemplateErrorList[id]){
+				let filterTemplateEntries=this.state.filterTemplateEntriesList[id];
+				let staticTemplateFilters = this.state.staticTemplateFiltersList[id];
+				templateheaderSaveQuery= <div>
+				{Object.keys(filterTemplateEntries).map((index) => {
+					let filterTemplateEntry = filterTemplateEntries[index];
+					return Object.keys(filterTemplateEntry).map((key) =>{
+						let filterTemplateEntryKey=filterTemplateEntry[key];
+						let columns =this.populateFilteredColumnOptions(key,id);//this.populateColumnOptions(key);
+						return 	<table className='table table-hover table-striped savedQueryTemplate' style={{margin:'0px',padding:'2px'}} id={'table_'+key}>
+									<thead>
+										<tr>
+											<th colSpan='2'>{key.toUpperCase()}</th>
+											{this.state.enableRealTime && <th width='20%'></th>}
+											<th width={(this.state.enableRealTime)?'30%':'25%'}></th>
+											<th width={(this.state.enableRealTime)?'20%':'25%'}>
+												<button id={key+'_addAND'} className='btn btn-secondary' disabled ={!filterTemplateHeaderList[id][key]['enableAnd']} type='button' onClick={e => {this.addAndTemplate(key,id)}}>Add Filter</button>
+											</th>
+										</tr>
+									</thead>
+									<tbody>
+										{Object.keys(filterTemplateEntryKey).sort().map((entryKey, entry) => {
+											entityKeyAddition = parseInt(entryKey) + 2;
+											let valueArray = filterTemplateEntryKey[entryKey].value.split('^');
+											console.log("Comparing Static Array: " + JSON.stringify(staticTemplateFilters) + " with " + key + "|" + filterTemplateHeaderList[id][key]['propName']);
+											if(staticTemplateFilters.indexOf(key + "|" + filterTemplateEntryKey[entryKey].name) === -1 ){
+											    return(
+											    	<tr>
+											    		<td width={(this.state.enableRealTime)?'10%':'25%'}>
+											    			<label>{'$' + (filterTemplateEntryKey[entryKey].templateKey + 1)}</label>
+											    		</td>
+											    		<td width={(this.state.enableRealTime)?'20%':'25%'}>
+											    			{filterTemplateEntryKey[entryKey].name !== '' && filterTemplateEntryKey[entryKey].name !== 'ERROR' && <label>{filterTemplateEntryKey[entryKey].name}</label>}
+											    			{filterTemplateEntryKey[entryKey].name === '' && <SelectFilter param={this.state}
+											    				filterList={columns}
+											    				id={key+'#'+filterTemplateEntryKey[entryKey].templateKey+'#'+id}
+											    				selectedFilter={filterTemplateHeaderList[id][key]['propName']}
+											    				onMenuSelect={this.updatePropertyFilter}/>}
+											    			{filterTemplateEntryKey[entryKey].name === 'ERROR' && <div className='inputBoxError'><SelectFilter param={this.state}
+											    				filterList={columns}
+											    				id={key+'#'+filterTemplateEntryKey[entryKey].templateKey+'#'+id}
+											    				selectedFilter={this.state.filterDisplay}
+											    				onMenuSelect={this.updatePropertyFilter}/></div>}
+											    		</td>
+											    		{this.filterTags(filterTemplateEntryKey[entryKey].type,filterTemplateEntryKey[entryKey].templateKey,key,id)}
+											    		<td width={(this.state.enableRealTime)?'30%':'25%'}>
+											    			{Object.keys(valueArray).map((indx) =>{
+											    					return(
+											    						<div style={{margin:'5px'}}>
+											    							{valueArray[indx] === '' && <input id={key+'_'+indx} onBlur={e => this.updateTemplateFilterValues(key,filterTemplateEntryKey[entryKey].templateKey,e.target.value,e.target.id,id)}/>}
+											    							{valueArray[indx] !== '' && <input id={key+'_'+valueArray[indx]+'_'+indx} value={valueArray[indx]} onChange={e => this.updateTemplateFilterValues(key,filterTemplateEntryKey[entryKey].templateKey,e.target.value,e.target.id,id)}/>}
+											    							{indx == 0 && <button className={(filterTemplateEntryKey[entryKey].name !== '')?'btn btn-primary':'btn btn-secondary'} style={{padding:'2px',margin:'0px 0px 7px 5px'}} disabled={filterTemplateEntryKey[entryKey].name === ''} type='button' onClick={e => {this.addOrTemplate(key,filterTemplateEntryKey[entryKey].name,filterTemplateEntryKey[entryKey].templateKey,id)}}>+</button>}
+											    							{indx>0 && <button style={{padding:'2px',margin:'0px 0px 7px 5px'}} id={'delete-'+indx} className='btn btn-danger' type='button' onClick={e => {this.deleteOrTemplate(key,filterTemplateEntryKey[entryKey].templateKey,e.target.id,id)}}>x</button> }
+											    						</div>
+											    					)
+											    			})}
+											    		</td>
+											    		<td width={(this.state.enableRealTime)?'20%':'25%'}>
+											    			{filterTemplateEntryKey[entryKey].addition &&<button id='deleteAnd' className='btn btn-secondary' type='button' onClick={e => {this.updateSavedQueryTemplate('delete',key,filterTemplateEntryKey[entryKey].templateKey,'','',id)}}>Delete</button>}
+											    		</td>
+											    	</tr>);
+											}else {
+											    return;
+											}
+										})}
+									</tbody>
+								</table>						
+								})
+						})}
+						</div>
+		}
+		return templateheaderSaveQuery;
+  };
+  downloadBulkDslToExcel = () =>{
+	console.log('downloadBulkDslToExcel>>>>>>>>>>>');		
+	let path='bulk-dsl-to-excel';
+	this.generatebulkDslToExcel(path,false)
+  }
+  generatebulkDslToExcel = (path,state) =>{
+  	this.setState({isLoading: true});
+	Object.keys(settings).forEach((key)=>{
+		if(key==='ISAPERTURE' || key==='ISTABULAR'){
+			delete settings[key];
+		}
+	})
+	let mergedTabs=this.state.isMergedTabsChecked;
+	var payload =  {'headers':{
+		'X-DslApiVersion':'V2',
+		'use-aperture': this.state.enableRealTime,
+		'schema-version': INVLIST.VERSION,
+		'merge-tabs':mergedTabs,
+		'accept': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+		},'dsls': []};
+		
+	Object.keys(this.state.queryNameList).map((index)=>{
+		if(!this.state.filterTemplateErrorList[index]){
+			let query=this.formFinalTemplateQuery(index);		
+			let obj={
+				"query-id": parseInt(index)+1, 
+				"query-name": this.state.queryNameList[index], 
+				"query-description": this.state.queryDescriptionList[index], 
+				"is-aggregate": this.state.isAggregateCheckedList[index], 
+				"dsl": query
+				};
+			payload['dsls'].push(obj);
+		}
+	});
+	var email='';	
+	if(state){
+		let userid = sessionStorage.getItem(ENVIRONMENT + 'userId');
+		if(userid ==='testuid'){// For testing Purpose
+			email='AAI-UI-DEV@list.att.com';
+		}else{
+			email=userid+EMAIL_EXT;
+		}		
+		payload['headers']['email'] = email;
+	}
+	console.dir('CustomDSL:payload:' + JSON.stringify(payload));
+	commonApi(settings, path, 'POST', payload, '',GlobalExtConstants.OVERRIDE_DOMAIN, null, [{
+																"name":"X-DslApiVersion",
+																"value": "V2"},
+																{
+																"name":"use-aperture",
+																"value": this.state.enableRealTime
+																},
+																{
+																"name":"schema-version",
+																"value":INVLIST.VERSION},
+																{
+																"name":"accept",
+																"value":"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+																},{
+																"name":"encode-response",
+																"value":true}
+															])
+	.then(res => {			
+			let success =true;
+			let failures=[];
+			if(!state){
+				if(res['headers']['failures']){
+					failures=res['headers']['failures'].split(',');
+					for (var i = 0; i < failures.length; i++) {
+						var a = failures[i].split('|');
+						a.splice(1, 1);
+						failures[i] = a.join();
+					}
+					success=false;
+				}else{
+					let filename='';
+					if(res['headers']['content-disposition']){
+						filename=res['headers']['content-disposition'].split('=')[1];
+					}else if(res['headers']['Content-Disposition']){
+						filename=res['headers']['content-disposition'].split('=')[1];
+					}
+					const blob = new Blob([this.s2ab(atob(res.data))],
+					{ type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;base64,'});
+					const url = window.URL.createObjectURL(blob);
+					const anchor = document.createElement('a');
+					document.body.appendChild(anchor);
+					anchor.href = url;
+					anchor.download = filename;
+					anchor.click();
+					window.URL.revokeObjectURL(url);
+				}
+				this.setState({
+					isLoading: false,
+					downloadTemplateStatus:success,
+					failedDownloadedTemplate:failures,
+					failedDownloadedTemplateMsg:'',
+					failedEmailTemplateMsg:'',
+					emailTriggerMsg:''
+				},()=>{GeneralCommonFunctions.scrollTo("downloadTemplateStatusAlert");});							
+			}else{
+				let emailTriggerMsg='';
+				let failedEmailTriggerMsg='';
+				success=false;
+				failures=[];
+				if(res.status === 202){
+					emailTriggerMsg='The job has been successfully triggered. The results will be emailed to '+ email +' when finished.'
+				}else{
+					failedEmailTriggerMsg='Failed to Generate an Email for selected template queries';
+				}
+				this.setState({
+					isLoading: false,
+					downloadTemplateStatus:success,
+					failedDownloadedTemplate:failures,
+					failedDownloadedTemplateMsg:'',
+					failedEmailTemplateMsg:failedEmailTriggerMsg,
+					emailTriggerMsg:emailTriggerMsg
+				},()=>{GeneralCommonFunctions.scrollTo("downloadTemplateStatusAlert");});
+			}				
+		}).catch(error => {
+			console.log('Bulk download xls Catch the Error>>>>>',error.response);
+			let ErrorMessage=(state)?'Failed to Generate an Email for selected template queries':'Failed to Download selected template queries';
+			if (error.response && error.response.data) {
+				if(error.response.data.status){
+					ErrorMessage += " Code: " + error.response.data.status;
+				}
+				if(error.response.data.msg){
+					ErrorMessage += " - " + JSON.stringify(error.response.data.msg);
+			  }
+			}
+			if(state){
+				this.setState({
+					isLoading: false,
+					downloadTemplateStatus:false,
+					failedDownloadedTemplate:[],
+					failedDownloadedTemplateMsg:'',
+					failedEmailTemplateMsg:ErrorMessage
+				},()=>{GeneralCommonFunctions.scrollTo("downloadTemplateStatusAlert");});
+			}else{
+				this.setState({
+					isLoading: false,
+					downloadTemplateStatus:false,
+					failedDownloadedTemplate:[],
+					failedDownloadedTemplateMsg:ErrorMessage,
+					failedEmailTemplateMsg:'',
+					emailTriggerMsg:''
+				},()=>{GeneralCommonFunctions.scrollTo("downloadTemplateStatusAlert");});
+			}
+			
+		});
+  }
+  s2ab=(s)=> {
+	var buf = new ArrayBuffer(s.length);
+	var view = new Uint8Array(buf);
+	for (var i=0; i!=s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
+	return buf;
+  }
+  templateList = () =>{
+	var filterTypeHeader='';
+	if(APERTURE_SERVICE){		
+		filterTypeHeader =  (this.state.enableRealTime)?<th scope='col' width='20%'>Filter Type</th>:''; 
+	}
+	var listOfTemplate=[];
+	Object.keys(this.state.filterTemplateEntriesList).map((idx)=>{
+		let templateList =<div id={"template_"+idx} className="col-lg-10 templateview">
+						{this.state.filterTemplateEntriesList[idx].length > 0 && !this.state.filterTemplateErrorList[idx] &&
+					  		<div className='card d3-model-card model-card-content'>
+							  <Alert id='saveSuccess' bsStyle='success' className={this.state.saveSuccessfulMsg && !this.state.isEditModal ? 'show' : 'hidden'} onDismiss={() => this.setState({saveSuccessfulMsg: false})}>
+								  <h3>Query Saved Successfully</h3>
+								  <p>
+									  {this.state.saveSuccessfulMsg}
+								  </p>
+							</Alert>
+							<div className='card-header'>
+								<div>
+									<h3><strong>{parseInt(idx)+1}.{this.state.queryNameList[idx]}</strong> - {this.state.queryDescriptionList[idx]}</h3>
+								</div>
+							</div>
+							<div>
+								<div className='card-header'>
+									<h5>{this.state.templateQueryList[idx]}</h5>
+								</div>
+								<table className="table table-hover table-striped" style={{margin:'0px',padding:'2px'}}>
+									<thead>
+										<tr>
+											<th scope="col" width={(this.state.enableRealTime)?'10%':'25%'}>Filter Key</th>
+											<th scope="col" width={(this.state.enableRealTime)?'20':'25%'}>Filter Name</th>
+											{filterTypeHeader}
+											<th scope="col" width={(this.state.enableRealTime)?'30%':'25%'}>Filter Value</th>
+											<th scope="col" width={(this.state.enableRealTime)?'20%':'25%'}> Action</th>
+										</tr>
+									</thead>
+								</table>
+							</div>
+							<div className='card-content model-card-content' style={{margin:'0px'}}>									
+								{this.templateheaderSaveQuery(idx)}                               
+							 </div>
+							<div className='card-footer'>
+								<button id='runSavedQuery' className='btn btn-primary btn-space' type='button' onClick={e => {this.runTemplate(idx)}}>Run Query</button>
+								<button id='manualEditQuery' className='btn btn-secondary btn-space' type='button' onClick={e =>{this.showEditDSLModal(idx)}} disabled={this.templateError.length>0}>Manual Edit & Run</button>
+								<button id='saveQuery' className='btn btn-outline-secondary btn-space' type='button' onClick={e =>{this.saveTemplate(idx)}} disabled={this.templateError.length>0}>Save</button>
+								<div className={'checkbox ' + (GlobalExtConstants.INVLIST.IS_ONAP ? 'hidden' : '' )}>
+									<label>
+									<input type="checkbox" id='aggregateObjects' checked={this.state.isAggregateCheckedList[idx]} onChange={this.onAggregateCheckbox.bind(this)} />
+									Aggregate Objects
+									</label>
+								</div>
+							</div>
+					 </div>
+				}
+				{this.state.queryNameList[idx] && this.state.filterTemplateEntriesList[idx].length === 0 && !this.state.filterTemplateErrorList[idx] &&
+					<div className='addPaddingTop alert alert-warning' role="alert">
+					  No filters present to populate for this saved query, please run as is or edit the query manually and run.
+					</div>
+				}
+				{this.state.filterTemplateErrorList[idx] &&
+				  <div className='addPaddingTop alert alert-danger' role="alert">
+					An error occurred in parsing the template, please try a different template or contact the data steward to resolve this issue.
+				  </div>
+				}
+		</div>;
+		listOfTemplate.push(templateList);
+	});	
+	console.log('listOfTemplate>>>>>#####>>>>>>>',listOfTemplate);
+	return listOfTemplate;
+  }
+
+
+  render(){
+	let downloadRangeModel = this.prepareDownloadRangeModel();
+	let templateList= this.templateList();
+	var toggelRealtimeAnalysis = '';
+	var emailCheckbox = <div className={(this.dslObjectList.length>0)?'show':'hidden'}>
+							<div className="checkbox">
+								<OverlayTrigger  placement='top' overlay={<Tooltip id='tooltip-top'>{'Report will be generated and emailed to '+sessionStorage.getItem(ENVIRONMENT + 'userId')+'@att.com when finished'}</Tooltip>}>
+									<span className="d-inline-block" style={{display: 'inline-block'}}>
+										<Button bsSize='small' disabled={(this.dslObjectList.length===0)} onClick={() => {this.onGenerateEmailButton()}}>
+											Generate & Email <i className='icon-documents-folder'></i>
+										</Button>
+									</span>
+								</OverlayTrigger>
+							</div>
+						</div>
+	var mergedTabs = <div className={(this.dslObjectList.length>0)?'show':'hidden'}>
+						<div className="checkbox">
+							<label>
+								<input type="checkbox" checked={this.state.isMergedTabsChecked} onChange={this.onMergedTabsCheckbox.bind(this)} />
+								Merge Tabs
+							</label>
+						</div>
+					 </div>
+	var downloadAllTemplateQueries = <div className={(this.dslObjectList.length>0)?'show':'hidden'}>
+										<OverlayTrigger  placement='top' overlay={<Tooltip id='tooltip-top'>{this.downloadBulkTooltip}</Tooltip>}>
+											<span className="d-inline-block" style={{display: 'inline-block'}}>
+												<Button bsSize='small' disabled={(this.dslObjectList.length===0)} onClick={() => {this.downloadBulkDslToExcel()}}>
+													Download Loaded Queries <i className='icon-documents-downloadablefile'></i>
+												</Button>
+											</span>
+										</OverlayTrigger>										
+								 	</div>
+	let downloadTemplateStatusAlert= <div className={(this.dslObjectList.length>0)?'show':'hidden'}>
+										<Alert id="saveSuccess" bsStyle="success" className={(this.state.downloadTemplateStatus && this.state.failedDownloadedTemplate.length===0)?'show':'hide'} onDismiss={() => this.setState({
+												downloadTemplateStatus:false,
+												failedDownloadedTemplate:[],
+												failedDownloadedTemplateMsg:'',
+												failedEmailTemplateMsg:'',
+												emailTriggerMsg:''})}>
+											<h3>Download Loaded Templates are  Successfully</h3>
+											<p>
+												The selected templates downloaded successfull.
+											</p>
+										</Alert>
+										{this.state.failedDownloadedTemplate.length>0 && <Alert id="saveFailure" bsStyle="danger"  onDismiss={() => this.setState({
+												downloadTemplateStatus:false,
+												failedDownloadedTemplate:[],
+												failedDownloadedTemplateMsg:'',
+												failedEmailTemplateMsg:'',
+												emailTriggerMsg:''})}>
+											<h3>Download Loaded Templates are Failed</h3>
+											<p>											
+												{this.state.failedDownloadedTemplate.toString()} templates are failed to download.Please refer the downloaded spreadsheet for more details.
+											</p>
+										</Alert>}
+										{this.state.failedDownloadedTemplateMsg !=='' && <Alert id="saveFailure" bsStyle="danger" onDismiss={() => this.setState({
+												downloadTemplateStatus:false,
+												failedDownloadedTemplate:[],
+												failedDownloadedTemplateMsg:'',
+												failedEmailTemplateMsg:'',
+												emailTriggerMsg:''})}>
+											<h3>Download Loaded Templates are Failed</h3>
+											<p>											
+												{this.state.failedDownloadedTemplateMsg}
+											</p>
+										</Alert>}
+										{this.state.emailTriggerMsg !=='' && <Alert id="saveSuccess" bsStyle="success" onDismiss={() => this.setState({failedEmailTemplateMsg:'',emailTriggerMsg:''})}>
+											<h3>Generate & Email Triggered</h3>
+											<p>											
+												{this.state.emailTriggerMsg}
+											</p>
+										</Alert>}
+										{this.state.failedEmailTemplateMsg !=='' && <Alert id="saveFailure" bsStyle="danger" onDismiss={() => this.setState({failedEmailTemplateMsg:'',emailTriggerMsg:''})}>
+											<h3>Generate & Email Templates is Failed</h3>
+											<p>											
+												{this.state.failedEmailTemplateMsg}
+											</p>
+										</Alert>}										
+									</div>
+	if(APERTURE_SERVICE){		
+		toggelRealtimeAnalysis = <div className='toggleSwitch'><BootstrapSwitchButton
+									checked={!this.state.enableRealTime}
+									onlabel='Real Time'
+									onstyle='danger'
+									offlabel='Analysis'
+									offstyle='success'
+									style='w-100 mx-3'
+									onChange={(checked) => {
+										this.toggleRealTimeAnalysisCallback(checked);
+									}}
+								/></div>             
+	}
+		const inputProps = {
+			placeholder: 'Please enter a query',
+			value: this.state.value,
+			onChange: this.onChange,
+			onSelect: this.onSelect,
+			onClick: this.onClick
+		};
+
+		let nodes = [];
+		if ( this.state.isAggregate && this.state.aggregateNodes.length > 0 ) {
+
+			console.log('nodes exist', JSON.stringify(this.state.aggregateNodes[0]));
+            if(this.state.isAggregate && this.state.viewName === 'CardLayout'){
+                var nodeDetails = this.state.aggregateNodes.map(entry => {
+                                                           return <Col lg={4} md={4} sm={6} xs={12}>
+                                                                   <div className='card aggregate-card'>
+                                                                        <div className='card-header'>
+                                                                          <h4 className='card-title'>{entry.nodePath}</h4>
+                                                                        </div>
+                                                                        <div className='card-content aggregate-card-content'>
+                                                                        <span>
+                                                                    {entry && typeof entry.map === 'function' && entry.map(subEntry =>
+                                                                         {  let nodesPropList={};
+																			return Object.keys(subEntry).map((node) => {
+																						 console.log("subentry : " + JSON.stringify(node + ' ' + JSON.stringify(subEntry[node])));
+																						 let description='';
+																						 let nodeType=subEntry[node]['node-type'];
+																						 if(!nodesPropList[nodeType]){																							
+																							var requiredParams = buildAttrList(nodeType,[],'mandatory');
+																							nodesPropList[nodeType]=requiredParams;
+																						 }
+                                                                                         return (<span>
+                                                                                                     {this.state.associatedNodesEnabled && (<Alert bsStyle="info"><strong>{node}</strong></Alert>)}
+                                                                                                     {Object.keys(subEntry[node].properties).map((key)=>{
+																										 let propKey=key.split('|')[1];
+																										 let found=true;
+																										 for(var a in nodesPropList[nodeType]){
+																											if(propKey===nodesPropList[nodeType][a].value){
+																												found=false;
+																												return (<p className="aggregate-attribute"><strong title={nodesPropList[nodeType][a].description}>{key}</strong> : {"" + subEntry[node].properties[key]}</p>);
+																											}
+																										 }
+																										 if(found){
+																											return (<p className="aggregate-attribute"><strong>{key}</strong> : {"" + subEntry[node].properties[key]}</p>);
+																										 }                                                                                                        
+                                                                                                     })
+                                                                                                     }
+                                                                                                 </span>)
+                                                                                     })
+                                                                         })
+                                                                     }
+
+                                                                          {this.state.associatedNodesEnabled && (<Alert bsStyle="info"><strong>{entry.fullPath}</strong></Alert>)}
+                                                                        </span>
+                                                                        </div>
+                                                                    </div>
+                                                                   </Col>;
+                                                   });
+                nodes =
+                <div className='model-container'>
+                	{nodeDetails}
+                </div>;
+            }else if(this.state.isAggregate && this.state.viewName === 'CellLayout'){
+               if(this.state.aggregateAttrList.length > 0 && this.state.aggregatePaths){
+                   var types = this.state.aggregatePaths;
+                   var type = types[0];
+                   let tabs=types.map((nodeType,index) => {
+			   if(this.state.tabularAggregateData[nodeType] && this.state.tabularAggregateColumns[nodeType]){
+	                     return(
+	                       <Tab eventKey={nodeType} title={nodeType}>
+	                         <BootstrapTable
+	                             id={nodeType}
+	                             keyField='id'
+	                             data={this.state.tabularAggregateData[nodeType]}
+	                             columns={this.state.tabularAggregateColumns[nodeType]}
+	                             bordered={ true }
+	                             headerClasses='table-header-view'
+	                             columnFilter={ true }
+	                             filter={ filterFactory() }
+	                             bootstrap4 striped hover condensed
+	                         />
+	                       </Tab>
+	                     )
+			   }
+	           });
+
+		    nodes =
+		    	 <div>
+				<button type='button' className={(this.state.disableFilter)? 'btn btn-outline-secondary' : 'btn btn-primary'} disabled={this.state.disableFilter} onClick={() => {this.isTableFilterForAggregation(this.state.columnFilter,this.state.tabularAggregateColumns[type])}} style={{float: 'right', margin: '2px'}}>Apply Filters (All)</button>
+                         	<Tabs defaultActiveKey={type} id="multipleTabularView">
+                          		{tabs}
+                        	</Tabs>
+			 </div>;
+                }
+            }else if(this.state.isAggregate && this.state.viewName === 'VisualLayout'){
+                     nodes = <span></span>;
+            }
+		}else if (this.state.nodes.length > 0){
+		    const modelGalleryElement = <ModelGallery
+            								nodes={this.state.nodes}
+            								viewName={this.state.viewName}
+            								historyStackString={this.props.location.historyStackString}
+            								openHistoryModal={this.openHistory}
+            								isPageNumberChange={this.state.isPageNumberChange}
+            								resetColumnInd={this.state.resetColumnFilters}
+									isTableFilterApply={this.isTableFilterApply}
+									dslQuery={this.state.value}
+									enableRealTime={this.state.enableRealTime}
+									tableFilterAliasColumns={this.tableFilterAliasColumns}/>;
+            nodes =
+            <div className='model-container'>
+            	{modelGalleryElement}
+            </div>;
+		}				
+	return(
+		<div>
+			{toggelRealtimeAnalysis}
+			<div className='addPadding customDsl'>
+		    <div className='static-modal'>
+					<Modal show={this.state.showHistoryModal} onHide={this.closeHistory}>
+						<Modal.Header>
+							<Modal.Title>Retrieve {(this.state.focusedNodeType) ? this.state.focusedNodeType: ' BYOQ Query '} History</Modal.Title>
+						</Modal.Header>
+						<Modal.Body>
+							<form className={this.state.showModelOptions ? 'show' : 'hidden'} id='historyForm' name='historyForm'>
+								<div className="radio">
+									<label>
+									<input type="radio" value="nodeState"
+													checked={this.state.historyType === 'nodeState'}
+													onChange={(e) => this.setHistoryType(e)} />
+									View state at
+									</label>
+								</div>
+								<div className="radio">
+									<label>
+									<input type="radio"  value="nodeLifeCycleSince"
+													checked={this.state.historyType === 'nodeLifeCycleSince'}
+													onChange={(e) => this.setHistoryType(e)} />
+									View updates since
+									</label>
+								</div>
+								<div className="radio">
+									<label>
+									<input type="radio" value="nodeLifeCycle"
+													checked={this.state.historyType === 'nodeLifeCycle'}
+													onChange={(e) => this.setHistoryType(e)} />
+									View all updates
+									</label>
+								</div>
+							</form>
+							<div className={this.state.enableCalendar ? 'show' : 'hidden'}>
+									<DatePicker
+											inline
+													selected={this.state.startDate}
+													onChange={(newDate) => this.handleDateChange(newDate)}
+													showTimeSelect
+													timeFormat="HH:mm"
+													timeIntervals={15}
+													dateFormat="MMMM D, YYYY h:mm a"
+													timeCaption="time"
+											/>
+									</div>
+						</Modal.Body>
+						<Modal.Footer>
+							<Button onClick={this.closeHistory}>Close</Button>
+							<Button onClick={this.submitHistory}>Submit</Button>
+						</Modal.Footer>
+					</Modal>
+        </div>
+        <div className='static-modal'>
+        	<Modal show={this.state.showEditModal} onHide={this.closeEditDSLModal}>
+        		<Modal.Header>
+        			<Modal.Title>Edit DSL Query</Modal.Title>
+        		</Modal.Header>
+        		<Modal.Body>
+                    <form id='dslQueryEditable' name='dslQueryEditable'>
+                        <FormGroup controlId="dslQuery">
+                              <ControlLabel>DSL Query</ControlLabel>
+                              <FormControl className="template-textarea" onChange={this.bindEdits.bind(this)} value={this.state.editModel} componentClass="textarea" placeholder="Enter DSL Query" />
+                         </FormGroup>
+                    </form>
+        		</Modal.Body>
+        		<Modal.Footer>
+        			<Button onClick={this.closeEditDSLModal}>Close</Button>
+        			<Button onClick={this.submitEditAndRunDSL}>Submit</Button>
+        		</Modal.Footer>
+        	</Modal>
+        </div>
+        <div className='static-modal'>
+                  		<Modal show={this.state.showNodeModal} onHide={this.closeNodeModal} dialogClassName="modal-override">
+                  			<Modal.Header>
+                  				<Modal.Title>Retrieve {this.state.nodeDisplay}</Modal.Title>
+                  			</Modal.Header>
+                  			<Modal.Body>
+                                <Grid fluid={true}>
+                                      <Row className='show-grid'>
+                                        <Col lg={12} md={12} sm={12} xs={12}>
+                                            <ModelCard
+                                                        key={this.state.focusedNode.id}
+                                                        nodeId={this.state.focusedNode.id}
+                                                        nodeType={this.state.focusedNode['node-type']}
+                                                        nodeProps={this.state.focusedNode.properties}
+                                                        nodeRelatives={this.state.focusedNode['related-to']}
+                                                        nodeUrl={this.state.focusedNode.url}
+                                                        historyStackString={this.props.location.historyStackString}
+                                                        openHistoryModal={this.openHistory}
+														enableRealTime={this.state.enableRealTime}/>
+                                        </Col>
+                                      </Row>
+                                </Grid>
+                  			</Modal.Body>
+                  			<Modal.Footer>
+                  				<Button onClick={this.closeNodeModal}>Close</Button>
+                  			</Modal.Footer>
+                  		</Modal>
+        </div>
+        <div className='static-modal'>
+                  		<Modal show={this.state.showSaveModal} onHide={this.closeSaveModal} dialogClassName="modal-override">
+                  		    <Spinner loading={this.state.enableSaveBusyFeedback}>
+                  			    <Modal.Header>
+                  			    	<Modal.Title>{this.state.isEditModal ? 'Edit' : 'Save'} DSL Query</Modal.Title>
+                  			    </Modal.Header>
+                  			    <Modal.Body>
+                  			         <Alert id="saveFailure" bsStyle="danger" className={this.state.saveFailureMsg ? 'show' : 'hidden'} onDismiss={() => this.setState({saveFailureMsg: false})}>
+                                         <h3>Query Save Failed</h3>
+                                         <p>
+                                           {this.state.saveFailureMsg}
+                                         </p>
+                                     </Alert>
+                                    <form className={!this.state.showQueryExistsWarning ? 'show' : 'hidden'} id='saveDslQueryForm' name='saveDslQueryForm'>
+                                      <FormGroup controlId="queryName">
+                                           <ControlLabel>Query Name</ControlLabel>
+										  {!this.state.isEditModal && (<input id='dslNameHelp' type='name' className='form-control' id='queryName' aria-describedby='dslNameHelp' placeholder='Enter query name' value={this.state.queryName} onChange={this.handleQueryNameChange}/>)}
+										  {!this.state.isEditModal && (<small id='queryNameHelp' className='form-text text-muted'>Select a name for your saved query, do not reuse names.</small>)}
+										  {this.state.isEditModal && (<p>{this.state.queryName}</p>)}
+                                      </FormGroup>
+                                      <FormGroup controlId="queryDescription">
+                                           <ControlLabel>Query Description</ControlLabel>
+                                           <FormControl componentClass="textarea" id="queryDescription" aria-describedby="queryDescriptionHelp" placeholder="Enter query description" value={this.state.queryDescription} onChange={this.handleQueryDescriptionChange} />
+                                           <small id="queryDescriptionHelp" className="form-text text-muted">Be as descriptive as possible to describe the purpose of the saved query (this will be searchable)</small>
+                                      </FormGroup>
+				      <FormGroup controlId="category">
+                                           <ControlLabel>Category</ControlLabel>
+                                           <input id='category' type="name" className="form-control"  aria-describedby="category of SavedQuery" placeholder="Enter category" value={this.state.category} onChange={this.handleCategoryChange}/>
+                                      </FormGroup>
+                                      <FormGroup controlId="privacy_indicator">
+                                        {this.state.isDataSteward && (<div className="checkbox">
+                                           <label>
+                                             <input type="checkbox" checked={this.state.isPublicChecked} onChange={this.onPublicCheckbox.bind(this)} />
+                                             Public
+                                           </label>
+                                        </div>)}
+                                        <div className={"checkbox " + ((!this.state.isPublicChecked || !this.state.isDataSteward) ? 'show' : 'hidden')}>
+                                           <label>
+                                             <input type="checkbox" checked={this.state.isCommunitySharedChecked} onChange={this.onCommunitySharedCheckbox.bind(this)} />
+                                             Share with Community
+                                           </label>
+                                        </div>
+                                        {!this.state.isDataSteward && (<ControlLabel>Personal Query</ControlLabel>)}
+                                      </FormGroup>
+                                      <FormGroup controlId='aggregate'>
+										  {this.state.isAggregateChecked && !(this.state.isEditModal || this.state.isSavedQueryFlow) && (<ControlLabel>Aggregate Query</ControlLabel>)}
+										  {!this.state.isAggregateChecked && !(this.state.isEditModal || this.state.isSavedQueryFlow) && (<ControlLabel>Standard Query</ControlLabel>)}
+										  {(this.state.isEditModal || this.state.isSavedQueryFlow) && (<div className='checkbox'>
+											  <label>
+												  <input type='checkbox' checked={this.state.isAggregateChecked} onChange={this.onAggregateCheckbox.bind(this)}/>
+												  Aggregate Query
+											  </label>
+										  </div>)}
+									  </FormGroup>
+                                      <FormGroup controlId='queryDSL'>
+                                           <ControlLabel>DSL Query</ControlLabel>
+										  {!this.state.isEditModal && !this.state.isSavedQueryFlow ? <p>{this.state.value}</p> : <FormControl componentClass='textarea' id='queryDSL' aria-describedby='queryDSLHelp' placeholder='Enter dsl query' value={this.state.value} onChange={this.handleQueryChange} />}
+									  </FormGroup>
+									  <FormGroup controlId='templateDetails'>
+									    <Spinner loading={this.state.enableTreeLoadBusyFeedback}>
+									       <div className={!this.state.treeLoadErrMsg ? 'show' : 'hidden'}>
+                                                <ControlLabel>Configuration Template Details - check for configurable, uncheck for static</ControlLabel>
+                                                {Object.keys(this.state.dslConfigArray).map(key => {
+                                                     return (this.state.dslConfigArray[key].filters).map(filter =>{
+                                                         return (<div className='checkbox'>
+                                                                 	  <label>
+                                                                 		  <input type='checkbox' checked={this.state.staticTemplateFilters.indexOf(key + '|' + filter) === -1} onChange={(e) => {this.onDslConfigCheckbox(e, key + '|' + filter)}} />
+                                                                 		  {key} - {filter}
+                                                                 	  </label>
+                                                                 </div>)
+                                                     })
+                                                  })
+                                                }
+                                           </div>
+                                           <Alert bsStyle="danger" className={this.state.treeLoadErrMsg ? 'show' : 'hidden'}>
+                                                <h3>Error Loading Configurable Filters</h3>
+                                                <p>
+                                                  {this.state.treeLoadErrMsg}
+                                                </p>
+                                            </Alert>
+                                        </Spinner>
+                                      </FormGroup>
+                                    </form>
+                                    <Alert bsStyle="warning" className={this.state.showQueryExistsWarning ? 'show' : 'hidden'} onDismiss={() => this.setState({showQueryExistsWarning: false})}>
+                                        <h3>Query Name Already Exists</h3>
+                                        <p>
+                                          There is already a query with the name {this.state.queryName}, do you wish to overwrite the existing query?
+                                        </p>
+                                    </Alert>
+                  			    </Modal.Body>
+                  			    <Modal.Footer className={!this.state.showQueryExistsWarning ? 'show' : 'hidden'}>
+                                	<Button onClick={this.closeSaveModal}>Close</Button>
+                                	<Button disabled={this.state.queryName.trim() === '' || this.state.queryDescription.trim() === ''} onClick={() => {this.submitSave()}}>Save</Button>
+                                </Modal.Footer>
+                                <Modal.Footer className={this.state.showQueryExistsWarning ? 'show' : 'hidden'}>
+                                	<Button onClick={() => this.setState({showQueryExistsWarning : false})}>No</Button>
+                                	<Button onClick={() => {this.submitSave(true)}}>Yes</Button>
+                                </Modal.Footer>
+                            </Spinner>
+                  		</Modal>
+        </div>
+			<div id="jumbotron" className='row'>
+				<div className={'row container-fluid my-4 '  + (this.state.isDSLFlow ? 'show' : 'hidden')}>
+					<div className='col-lg-12'>
+						<header className='jumbotron'>
+                                    <h1 className='display-2'><strong>B</strong>uild <strong>Y</strong>our <strong>O</strong>wn <strong>Q</strong>uery</h1>
+                                    <p className='lead'>
+                                      On this page you have the ability to craft your own query to retrieve objects from the database.
+                                      There are help menus in the accordions and a modal triggered from the light bulb icon to help with syntax.
+                                      There are is also a typeahead feature that will help you build your query as you type, providing valid nodes and attributes to use.
+                                    </p>
+                        </header>
+					</div>
+				</div>
+				<div className={'row container-fluid my-4 '  + (this.state.isSavedQueryFlow ? 'show' : 'hidden')}>
+                    <div className='col-lg-12'>
+                    	<header className='jumbotron'>
+                                    <h1 className='display-2'>Saved Queries</h1>
+                                    <p className='lead'>
+                                      On this page you have the ability to load and run previously saved queries.
+                                      You can run them as they are saved or choose to load them to replace the filters
+                                      in the template.
+                                    </p>
+                        </header>
+                    </div>
+				</div>
+		    </div>
+		    <div className='row'>
+			    <div className={'addPadding col-md-12 ' + (this.state.isSavedQueryFlow ? 'show' : 'hidden')}>
+					<div className='row'>
+						<div className='col-lg-10'>
+							<Alert id="saveSuccessEdit" bsStyle="success" className={this.state.saveSuccessfulMsg && this.state.isEditModal ? 'show' : 'hidden'} onDismiss={() => this.setState({saveSuccessfulMsg: false})}>
+								<h3>Query Saved Successfully</h3>
+								<p>
+									{this.state.saveSuccessfulMsg}
+								</p>
+							</Alert>
+						</div>
+					</div>
+			        <CustomDSLSaveLoad loadCallback={this.loadCallback} loadBulkCallback={this.loadBulkCallback} setQueriesState={this.setQueriesState} ref={this.saveLoadComponent} isDataSteward={this.state.isDataSteward} isSavedQueryFlow={this.state.isSavedQueryFlow} editCallback={this.editCallback}/>
+				<div className={'col-xs-1 ' + (GlobalExtConstants.INVLIST.IS_ONAP ? 'hidden' : '' )} >
+					<a href={INVLIST.USERGUIDE_URL} target="_blank">
+						<i className="dsl-hint icon-documents-manual"></i>
+					</a>
+					<pre>User<br />Guide</pre>
+				</div>
+				<div className='col-lg-11'><InfoToggle/></div>
+			</div>
+			<div className='row'>
+				<div className='col-md-12' id='templateList'>
+					{templateList}
+				</div>
+				<div className='col-md-10'  id='downloadTemplateStatusAlert'>
+					<div className='col-md-6'>
+						{downloadTemplateStatusAlert}
+					</div>
+					<div className='col-md-6'>
+						<div style={{float:'right'}}>
+							{emailCheckbox}
+						</div>
+						<div style={{float:'right',margin: '10px'}}>
+							{downloadAllTemplateQueries}
+						</div>
+						<div style={{float:'right',margin: '10px'}}>
+							{mergedTabs}
+						</div>											
+					</div>
+				</div>				
+				</div>			        
+				<div className={'addPadding col-md-9 ' + (this.state.isDSLFlow ? 'show' : 'hidden')}>
+					<form onSubmit={this.onAddItem} id='byoqFormForQuery' name='byoqFormForQuery'>
+					<div className='row'>
+						<div className='col-lg-9 form-group'>
+						    <Alert id="saveSuccess" bsStyle="success" className={this.state.saveSuccessfulMsg ? 'show' : 'hidden'} onDismiss={() => this.setState({saveSuccessfulMsg: false})}>
+			                                <h3>Query Saved Successfully</h3>
+			                                <p>
+			                                  {this.state.saveSuccessfulMsg}
+			                                </p>
+			                            </Alert>
+							<div id="byoqInput"><label htmlFor='newQuery'>Build Your Own Query</label></div>
+							<div className={this.state.isTypeahead ? 'show' : 'hidden'}>
+								<Autosuggest
+								suggestions={this.state.suggestions}
+								onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
+								onSuggestionsClearRequested={this.onSuggestionsClearRequested}
+								getSuggestionValue={this.getSuggestionValue}
+								renderSuggestion={this.renderSuggestion}
+								inputProps={inputProps}
+								shouldRenderSuggestions={this.shouldRenderSuggestions}
+								onSuggestionSelected={this.onSuggestionSelected}
+								ref={this.storeInputReference}
+								/>
+							</div>
+							<div className={this.state.isTypeahead ? 'hidden' : 'show'}>
+								<FormControl componentClass="textarea"
+								rows="4"
+								onChange={this.onTextAreaChange}
+								style={{width: '655px'}}
+								value={this.state.value}
+								/>
+							</div>
+						</div>
+					<div className={'col-xs-1 ' + (GlobalExtConstants.INVLIST.IS_ONAP ? 'hidden' : '' )}>
+						<a href={INVLIST.USERGUIDE_URL} target="_blank">
+							<i className="dsl-hint icon-documents-manual"></i>
+						</a>
+						<pre>User<br />Guide</pre>
+					</div>
+						<InfoToggle/>
+						<div className='col-xs-1'>
+							<i className='dsl-hint fa fa-question-circle-o' onClick={this.hint} ></i>
+						</div>
+						<div className='static-modal'>
+							<Modal show={this.state.showModal} onHide={this.close}>
+								<Modal.Header>
+									<Modal.Title>DSL Syntax</Modal.Title>
+								</Modal.Header>
+								<Modal.Body>
+									{
+										this.state.hintHtml.map(hints => {
+										return <div key={hints.notation}>
+										<label>{hints.notation}</label> =>
+										<pre style={{color: 'blue'}}>  {hints.description}</pre>
+										</div>;
+										})
+									}
+								</Modal.Body>
+								<Modal.Footer>
+									<Button onClick={this.close}>Close</Button>
+								</Modal.Footer>
+							</Modal>
+						</div>						
+					</div>
+					<div className='row'>
+						<div className='col-sm-10'>
+							<button id='runByoqQuery' className='btn btn-primary' type='submit'>Run</button>
+							{ !INVLIST.IS_ONAP &&(<button id='saveByoqQuery' className='btn btn-outline-secondary'  type='button' disabled={this.state.value.trim() === ''} onClick={this.openSaveModal}>Save</button>)}
+							{ INVLIST.isHistoryEnabled && (<button id='historyByoqQuery' className='btn btn-outline-secondary' type='button' disabled={this.state.value.trim() === ''} onClick={this.openHistory}>History</button>)}
+							<button id='clearByoqQuery' className='btn btn-outline-secondary' type='button' onClick={this.clear}>Clear</button>
+							<Toggle
+								id="typeAheadToggle"
+								defaultChecked={this.state.isTypeahead}
+								checked={this.state.isTypeahead}
+								className='toggle-theme'
+								onChange={this.handleTypeaheadChange} />
+							<span className='addPaddingLeft'>Typeahead</span>
+            			</div>
+					</div>
+				</form>
+				<div className={this.state.isInitialLoad ? 'hidden' : 'show'} id='dslInputError'>
+					<Row className={this.state.validInput ? 'hidden' : 'show show-grid'}>
+					  <Col md={12}>
+						<span className='label badge-pill label-danger'><strong>Error </strong>: Please enter a valid query input</span>
+					  </Col>
+					</Row>
+				</div>
+				<div className={'checkbox ' + (GlobalExtConstants.INVLIST.IS_ONAP ? 'hidden' : '' )}>
+                   <label>
+                     <input type="checkbox" id='aggregateObjectsChkbox' checked={this.state.isAggregateChecked} onChange={this.onAggregateCheckbox.bind(this)} />
+                     Aggregate Objects
+                   </label>
+                   {this.state.isAggregateChecked && (<label>
+                     <input id='includeAssociatedNodes' type="checkbox" checked={this.state.associatedNodesEnabled} onChange={this.onAssociatedNodesCheckbox.bind(this)} />
+                     Include Associated Nodes
+                   </label>)}
+                </div>
+			    <CustomDSLSaveLoad loadCallback={this.loadCallback} loadBulkCallback={this.loadBulkCallback} setQueriesState={this.setQueriesState} ref={this.saveLoadComponentDsl} isDataSteward={this.state.isDataSteward} editCallback={this.editCallback}/>
+			</div>
+			<div className={'col-lg-2 col-md-12 ' + (this.state.isDSLFlow ? 'show' : 'hidden')}>
+            	<PanelGroup accordion id='rb-accordion'>
+            		<Panel eventKey='1'>
+            		<Panel.Heading>
+            			<Panel.Title toggle>+ Simple Queries</Panel.Title>
+            		</Panel.Heading>
+            		<Panel.Body collapsible>
+						<div className='cardwrap'>
+							<div className='cardWrapHeaderTxt'>
+								<label>{this.state.simpleQueries.abstract}</label>
+							</div>
+							<div>
+							{this.state.simpleQueries.notation.map(entry => {
+								return (
+									<div key={entry.notation}>
+									<b><label>{entry.notation}</label></b> =>
+									<span style={{color: 'blue'}}> {entry.description}</span>
+								</div>
+								);
+							})}
+							</div>
+						</div>
+            		</Panel.Body>
+            		</Panel>
+            		<Panel eventKey='2'>
+            			<Panel.Heading>
+            				<Panel.Title toggle>+ Traversal Queries</Panel.Title>
+            			</Panel.Heading>
+            			<Panel.Body collapsible>
+							<div className='cardwrap'>
+								<div className='cardWrapHeaderTxt'>
+									<label>{this.state.traversalQueries.abstract}</label>
+								</div>
+								<div>
+									{this.state.traversalQueries.notation.map(entry => {
+									return (
+										<div key={entry.notation}>
+											<b><label>{entry.notation}</label></b> =>
+											<span style={{color: 'blue'}}> {entry.description}</span>
+										</div>
+									);
+									})}
+								</div>
+							</div>
+            			</Panel.Body>
+            		</Panel>
+            		<Panel eventKey='3'>
+            			<Panel.Heading>
+            				<Panel.Title toggle>+ Union Queries</Panel.Title>
+            			</Panel.Heading>
+            			<Panel.Body collapsible>
+							<div className='cardwrap'>
+								<div className='cardWrapHeaderTxt'>
+									<label>{this.state.unionQueries.abstract}</label>
+								</div>
+								<div>
+									{this.state.unionQueries.notation.map(entry => {
+									return (
+										<div key={entry.notation}>
+											<b><label>{entry.notation}</label></b> =>
+											<span style={{color: 'blue'}}> {entry.description}</span>
+									</div>
+									);
+									})}
+								</div>
+							</div>
+            			</Panel.Body>
+            		</Panel>
+            		<Panel eventKey='4'>
+            			<Panel.Heading>
+            				<Panel.Title toggle>+ Limit Queries</Panel.Title>
+            			</Panel.Heading>
+            			<Panel.Body collapsible>
+							<div className='cardwrap'>
+								<div className='cardWrapHeaderTxt'>
+									<label>{this.state.limitQueries.abstract}</label>
+								</div>
+								<div>
+									{this.state.limitQueries.notation.map(entry => {
+									return (
+										<div key={entry.notation}>
+											<b><label>{entry.notation}</label></b> =>
+											<span style={{color: 'blue'}}> {entry.description}</span>
+									</div>
+									);
+									})}
+								</div>
+							</div>
+            			</Panel.Body>
+            		</Panel>
+            		<Panel eventKey='5'>
+            			<Panel.Heading>
+            				<Panel.Title toggle>+ Negation Queries</Panel.Title>
+            			</Panel.Heading>
+            			<Panel.Body collapsible>
+							<div className='cardwrap'>
+								<div className='cardWrapHeaderTxt'>
+									<label>{this.state.negationQueries.abstract}</label>
+								</div>
+								<div>
+									{this.state.negationQueries.notation.map(entry => {
+									return (
+										<div key={entry.notation}>
+											<b><label>{entry.notation}</label></b> =>
+											<span style={{color: 'blue'}}> {entry.description}</span>
+										</div>
+									);
+									})}
+								</div>
+							</div>
+            			</Panel.Body>
+            		</Panel>
+            		<Panel eventKey='6'>
+            			<Panel.Heading>
+            				<Panel.Title toggle>+ Topology Queries</Panel.Title>
+            			</Panel.Heading>
+            			<Panel.Body collapsible>
+							<div className='cardwrap'>
+								<div className='cardWrapHeaderTxt'>
+									<label>{this.state.topologyQueries.abstract}</label>
+								</div>
+								<div>
+									{this.state.topologyQueries.notation.map(entry => {
+									return (
+										<div key={entry.notation}>
+											<b><label>{entry.notation}</label></b> =>
+											<span style={{color: 'blue'}}> {entry.description}</span>
+										</div>
+									);
+									})}
+								</div>
+							</div>
+            			</Panel.Body>
+            		</Panel>
+                <Panel eventKey='7' className={(this.state.enableRealTime) ? 'show' : 'hidden'}>
+                  <Panel.Heading>
+                    <Panel.Title toggle>+ Advanced Queries</Panel.Title>
+                  </Panel.Heading>
+                  <Panel.Body collapsible>
+                    <div className='cardwrap'>
+                      <div className='cardWrapHeaderTxt'>
+                        <label>{this.state.advancedQueries.abstract}</label>
+                      </div>
+                      <div>
+                        {this.state.advancedQueries.notation.map(entry => {
+                          return (
+                            <div key={entry.notation}>
+                              <b><label>{entry.notation}</label></b> =>
+                              <span style={{color: 'blue'}}> {entry.description}</span>
+                            </div>
+                          );
+                        })}
+                      </div>
+                    </div>
+                  </Panel.Body>
+                </Panel>
+            	</PanelGroup>
+            </div>
+            </div>
+            <div className='row'>
+			<div className='multipleNodes' id="outputBlock">
+			<Spinner loading={this.state.isLoading && this.state.isInitialLoad}>
+			</Spinner>
+				<div className={this.state.isInitialLoad ? 'hidden' : 'show'}>
+					<Spinner loading={this.state.isLoading} fullscreen={true}>
+						<div className={this.state.validInput ? 'show' : 'hidden'}>
+					    <Col md={12}>
+						    <h2 className='pre-wrap-text'>{this.state.header}</h2>
+						    <br/>
+						    <h5>Total Results: <strong>{this.state.totalResults}</strong></h5>
+						</Col>
+						{this.state.showResults && <div className="addPaddingTop" >
+						    <OutputToggle scope={this} visualDisabled={this.state.totalResults > PAGINATION_CONSTANT}/>
+						</div> }
+						{!this.state.isAggregate && (<div id="standardOutput" className="col-md-12">
+						    <Row className={this.state.showResults ? 'show' : 'hidden'}>
+						    	<Col md={8} className={this.state.showPagination ? 'show' : 'hidden'}>
+						    		<Pagination
+						    			activePage={this.state.activePage}
+						    			itemsCountPerPage={PAGINATION_CONSTANT.RESULTS_PER_PAGE}
+						    			totalItemsCount={this.state.totalResults}
+						    			pageRangeDisplayed={PAGINATION_CONSTANT.PAGE_RANGE_DISPLAY}
+						    			onChange={this.handlePageChange} />
+						    	</Col>
+						    	<Col md={2} className='text-right'>
+						    		<OverlayTrigger  placement='top' overlay={<Tooltip id='tooltip-top'>{this.downloadAllTooltip}</Tooltip>}>
+                 		    	 		<span className="d-inline-block" style={{display: 'inline-block'}}>
+						    				<Button bsSize='small' onClick={() => {this.getAllExcels(this.state.downloadCount)}}>
+						    					Download XLSX <i className='icon-documents-downloadablefile'></i>
+						    		</Button>
+						    			</span>
+						    		</OverlayTrigger>
+						    	</Col>
+						    	<Col md={2} className='text-right'>
+						    	    <OverlayTrigger  placement='top' overlay={<Tooltip id='tooltip-top'>{this.downloadRangeTooltip}</Tooltip>}>
+                  		    	    	<span className="d-inline-block" style={{display: 'inline-block'}}>
+						    	    			<Button bsSize='small' onClick={this.openDownloadRange}>
+						    	    			Download XLSX (Range) <i className='icon-documents-downloadablefile'></i>
+						    	    		</Button>
+						    	    	</span>
+						    	    </OverlayTrigger>
+						    	</Col>
+						    </Row>
+						    <hr/>
+						    <div className={'addPaddingTop alert alert-danger ' +(this.state.errorResults ? 'show' : 'hidden')} role="alert">
+                              An error occurred, please try again later. If this issue persists, please contact the system administrator. {this.state.errorMessage}
+                            </div>
+						    <Row className={this.state.noResults ? 'show' : 'hidden'}>
+						    	<Col md={12}>
+						    		<h2>No Results Found</h2>
+						    	</Col>
+						    </Row>
+						    <div className={this.state.errorResults || this.state.noResults ? 'hidden' : 'show'}>
+						    	<div className='nodes container-fluid'>
+						    		<div className='row-dsl'>
+						    			{nodes}
+						    		</div>
+						    	</div>
+						    </div>
+						    <Row className={this.state.showPagination ? 'show' : 'hidden'}>
+						    	<Col md={6}>
+						    		<Pagination
+						    			activePage={this.state.activePage}
+						    			itemsCountPerPage={PAGINATION_CONSTANT.RESULTS_PER_PAGE}
+						    			totalItemsCount={this.state.totalResults}
+						    			pageRangeDisplayed={PAGINATION_CONSTANT.PAGE_RANGE_DISPLAY}
+						    			onChange={this.handlePageChange} />
+						    	</Col>
+						    </Row>
+						</div>)}
+						{this.state.isAggregate && (<div id="aggregateOutput">
+                            		<Row className={ this.state.errorResults || this.state.noResults ? 'hidden' : 'show'}>
+								<Col md={8} className={this.state.showPagination ? 'show' : 'hidden'}>
+						    		<Pagination
+						    			activePage={this.state.aggregateActivePage}
+						    			itemsCountPerPage={PAGINATION_CONSTANT.RESULTS_PER_PAGE}
+						    			totalItemsCount={this.state.totalResults}
+						    			pageRangeDisplayed={PAGINATION_CONSTANT.PAGE_RANGE_DISPLAY}
+						    			onChange={this.handlePageChange} />
+						    	</Col>
+								<Col md={2} className='text-right'>
+						    		<OverlayTrigger  placement='top' overlay={<Tooltip id='tooltip-top'>{this.downloadAllTooltip}</Tooltip>}>
+                 		    	 		<span className="d-inline-block" style={{display: 'inline-block'}}>
+						    				<Button bsSize='small' onClick={() => {this.downloadAllAggregate(this.state.downloadCount)}}>
+						    					Download XLSX <i className='icon-documents-downloadablefile'></i>
+						    				</Button>
+						    			</span>
+						    		</OverlayTrigger>
+						    	</Col>
+								<Col md={2} className='pull-right text-right'>
+                            	    <OverlayTrigger  placement='top' overlay={<Tooltip id='tooltip-top'>Download All Aggregate Objects By Custom Range Selection</Tooltip>}>
+                            	    	<span className="d-inline-block" style={{display: 'inline-block'}}>
+                            	    			<Button bsSize='small' onClick={this.openDownloadRange}>
+                            	    			Download XLSX (Range) <i className='icon-documents-downloadablefile'></i>
+                            	    		</Button>
+                            	    	</span>
+                            	    </OverlayTrigger>
+                            	</Col>
+                            </Row>
+                            <hr/>
+                            <div className={'addPaddingTop alert alert-danger ' + (this.state.errorResults ? 'show' : 'hidden')} role="alert">
+                                    An error occurred, please try again later. If this issue persists, please contact the system administrator. {this.state.errorMessage}
+                                  </div>
+                            <Row className={this.state.noResults ? 'show' : 'hidden'}>
+                            	<Col md={12}>
+                            		<h2>No Results Found</h2>
+                            	</Col>
+                            </Row>
+                            <div className={this.state.errorResults || this.state.noResults ? 'hidden' : 'show'}>
+                            	<div className='nodes container-fluid'>
+                            		<div className='row-dsl'>
+                            			{nodes}
+                            			<div className={this.state.viewName === "VisualLayout" ? 'show' : 'hidden'}>
+                            			    <OutputVisualization identifier="currentStateAggregate" width={ window.outerWidth * 0.8 } height="1200" overflow="scroll"/>
+                                        </div>
+                            		</div>
+                            	</div>
+                            </div>
+							<Row className={this.state.showPagination ? 'show' : 'hidden'}>
+						    	<Col md={6}>
+								<Pagination
+						    			activePage={this.state.aggregateActivePage}
+						    			itemsCountPerPage={PAGINATION_CONSTANT.RESULTS_PER_PAGE}
+						    			totalItemsCount={this.state.totalResults}
+						    			pageRangeDisplayed={PAGINATION_CONSTANT.PAGE_RANGE_DISPLAY}
+						    			onChange={this.handlePageChange} />
+						    	</Col>
+						    </Row>
+						</div>)}
+			    			</div>
+							<Spinner loading={this.state.enableModelBusyFeedback}>
+								{downloadRangeModel}
+					  		</Spinner>
+					</Spinner>
+				</div>
+				<div className='row'>
+					<div className='col-sm-10'></div>
+				</div>
+			</div>
+			</div>
+		</div>
+	</div>
+  );
+	}
+}
+
+export default CustomDsl;
diff --git a/src/app/byoq/CustomDslBuilder.jsx b/src/app/byoq/CustomDslBuilder.jsx
new file mode 100644
index 0000000..1e034fa
--- /dev/null
+++ b/src/app/byoq/CustomDslBuilder.jsx
@@ -0,0 +1,1725 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, {Component} from 'react';
+import commonApi from 'utils/CommonAPIService.js';
+import {GeneralCommonFunctions} from 'utils/GeneralCommonFunctions.js';
+import Modal from 'react-bootstrap/lib/Modal';
+import Grid from 'react-bootstrap/lib/Grid';
+import FormGroup from 'react-bootstrap/lib/FormGroup';
+import FormControl from 'react-bootstrap/lib/FormControl';
+import ControlLabel from 'react-bootstrap/lib/ControlLabel';
+import Button from 'react-bootstrap/lib/Button';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+import Spinner from 'utils/SpinnerContainer.jsx';
+import Row from 'react-bootstrap/lib/Row';
+import Col from 'react-bootstrap/lib/Col';
+import Panel from 'react-bootstrap/lib/Panel';
+import Tooltip from 'react-bootstrap/lib/Tooltip';
+import FilterTypes from 'generic-components/filter/components/FilterTypes.jsx';
+import PathFilterDslBuilder from './PathFilterDslBuilder.jsx';
+import CustomDSLSaveLoad from 'app/byoq/CustomDSLSaveLoad.jsx';
+import BootstrapSwitchButton from 'bootstrap-switch-button-react';
+import * as d3 from "d3";
+import 'd3-selection-multi';
+
+
+let EDGERULES = GlobalExtConstants.EDGERULES;
+let OXM = GlobalExtConstants.OXM;
+let INVLIST = GlobalExtConstants.INVLIST;
+let ENVIRONMENT = GlobalExtConstants.ENVIRONMENT;
+let APERTURE_SERVICE = JSON.parse(sessionStorage.getItem(ENVIRONMENT + 'APERTURE_SERVICE'));
+
+
+let nodeTypes = [];
+let properties = null;
+let traverseRulesDsl = [];
+
+const settings = {
+	'NODESERVER': INVLIST.NODESERVER,
+	'PROXY': INVLIST.PROXY,
+  	'PREFIX': INVLIST.PREFIX,
+  	'VERSION': INVLIST.VERSION,
+    'APERTURE': INVLIST.APERTURE,
+    'USESTUBS': INVLIST.useStubs
+};
+class CustomDslBuilder extends Component {
+	constructor(props) {
+		console.log('props>>>>',props);
+        super(props);
+        this.saveLoadComponent = React.createRef();
+        APERTURE_SERVICE=JSON.parse(sessionStorage.getItem(ENVIRONMENT + 'APERTURE_SERVICE'));
+		this.state = {edgeRules : null,
+		              connectableNodes:[],
+		              showNodeModal: false,
+		              enableModalFeedback: false,
+		              showEditNodeModal: false,
+		              treemap: null,
+		              root: null,
+		              svg: null,
+		              duration: null,
+		              g: null,
+		              selectedNode: null,
+		              traverseToNodes:[],
+		              traverseToNodeAttributes: [],
+		              nodeDetails: [],
+		              dslQuery: '',
+		              editModel:'',
+		              showEditModal: false,
+		              zoomFit: null,
+		              autoZoomEnabled: true,
+		              aggregateObjects: false,
+		              init: true,
+		              filterTypeDisplay: 'Filter Type',
+                      selectedfilterType:[],
+                      oxmMapping: null,
+                      initialRootEdit: true,
+		              showPathFilterDslBuilder: false,
+                      pathFilterNodeType: '',
+                      pathFilterNodeName:'',
+                      pathFIlterAttrDetails: [],
+                      dslPathBuilder:'',
+                      dslPathTree:'',
+                      loadedQueries: [],
+                      queryDescription: '',
+                      queryName: '',
+                      category:'',
+                      queryId:'',
+                      treeLoadErrMsg: '',
+                      isEditEnable:false,
+                      pathFilterIndex:0,
+                      isDataSteward: sessionStorage.getItem(ENVIRONMENT + 'roles') && sessionStorage.getItem(ENVIRONMENT + 'roles').indexOf('data_steward_ui_view') > -1,
+                      isPublicChecked: sessionStorage.getItem(ENVIRONMENT + 'roles') && sessionStorage.getItem(ENVIRONMENT + 'roles').indexOf('data_steward_ui_view') > -1,
+		      enableRealTime: JSON.parse(sessionStorage.getItem(ENVIRONMENT + 'ENABLE_ANALYSIS'))
+                    }
+            this.baseState=this.state;
+  }
+  componentDidMount () {
+    console.log('componentDidMount',JSON.stringify(this.props));
+    //this.buildSQLStatementsFromSchema();
+    this.processEdgeRules(EDGERULES);
+    if(this.props.match.params.type && this.props.match.params.propId) {
+        this.build(this.props.match.params.type, this.props.match.params.propId);
+    }
+  }
+  initialize = () =>{
+    this.setState({enableModalFeedback: true}, function () {
+                                                  //console.log("EnableModalFeedback: " + this.state.enableModalFeedback);
+                                                  setTimeout(() => {this.postSpinner()},1);
+                                              });
+  }
+
+  postSpinner = () => {
+
+    var nodeDetails = [];
+    var node = null;
+    console.log('initializing');
+    var id = GeneralCommonFunctions.generateID();
+    var nodeTypes = GeneralCommonFunctions.getNodeTypes();
+    for (var i = 0; i < nodeTypes.length; i++) {
+    	    node = nodeTypes[i] + id;
+    	    var attributes = GeneralCommonFunctions.getFilteringOptions(nodeTypes[i]);
+    	    if(!nodeDetails[node] && Object.keys(attributes).length > 0){
+                nodeDetails[node] = {};
+                nodeDetails[node].nodeType = nodeTypes[i];
+                nodeDetails[node].isSelected = false;
+                nodeDetails[node].attrDetails = attributes;
+                nodeDetails[node].parentContainer = GeneralCommonFunctions.populateContainer(nodeTypes[i]);
+            }
+    }
+    let nodesSorted = nodeDetails.sort(function (filter1, filter2) {
+    	if (filter1.nodeType < filter2.nodeType) {
+    		return -1;
+    	} else if (filter1.nodeType > filter2.nodeType) {
+    		return 1;
+    	} else {
+    		return 0;
+    	}
+    });
+    //console.log('Node Types List' + JSON.stringify(nodesSorted));
+    nodeDetails = nodesSorted;
+    this.setState({nodeDetails: nodeDetails, showNodeModal: true, enableModalFeedback: false});
+  }
+  processEdgeRules = (data) => {
+  	this.setState({
+  		edgeRules: data.rules
+  	},()=>{this.baseState=this.state});
+  }
+  closeNodeModal = () =>{
+    this.setState({
+    	showNodeModal: false,
+    	enableModalFeedback: false,
+    	traverseToNodes: [],
+    	selectedNode: null
+    });
+  }
+  closeEditNodeModal = () =>{
+    this.setState({
+    	showEditNodeModal: false,
+        selectedNode: null,
+        showPathFilterDslBuilder: false
+    });
+  }
+  closePathNodeModal = () =>{
+    console.log('closePathNodeModal>>>>>>>');
+    this.setState({
+    	showPathFilterDslBuilder: false,
+        pathFilterNodeType: '',
+        pathFilterNodeName:'',
+        pathFIlterAttrDetails: []
+    });
+  }
+  submitPathNodeModal = (dslQuery,nodetype,dslQueryTree,isEditEnable,pathFilterIndex) =>{
+    console.log('CustomDSLBuilder  submitPathNodeModel>>>>>dslQuery ###',dslQuery);
+    console.log(isEditEnable+'<<submitPathNodeModal this.state.nodeDetails>>>>',this.state.nodeDetails)  
+    var nodeDetails = this.state.nodeDetails;
+    if(!nodeDetails[nodetype].dslPath){
+        nodeDetails[nodetype].dslPath=[];
+        nodeDetails[nodetype].dslPathTree=[];
+    }
+    if(isEditEnable){        
+        nodeDetails[nodetype].dslPath[pathFilterIndex]=dslQuery;
+        nodeDetails[nodetype].dslPathTree[pathFilterIndex]=dslQueryTree;
+        console.log('nodeDetails on edit>>>>>>>>>',nodeDetails);
+    }else{        
+        nodeDetails[nodetype].dslPath.push(dslQuery);
+        nodeDetails[nodetype].dslPathTree.push(dslQueryTree);
+    }    
+    this.setState({ nodeDetails: nodeDetails },()=>{this.closePathNodeModal()});    
+  }
+ editPathNodeModal = (key,path,tree,indx) =>{
+    console.log('editPathNodeModal>>>>>>>>>###',indx);
+    let attrDetails=this.state.nodeDetails[key].attrDetails; 
+    let nodeType=this.state.nodeDetails[key].nodeType;
+    this.setState({showPathFilterDslBuilder: true,pathFilterNodeType: key,pathFilterNodeName:nodeType,pathFIlterAttrDetails: '',dslPathBuilder: path,dslPathTree:tree,isEditEnable:true,pathFilterIndex:indx}); 
+ }
+ deletePathNodeModal = (key,path,tree,index) =>{
+    console.log(index+'<<deletePathNodeModal>>>>>',key);
+    var nodeDetails = this.state.nodeDetails;
+    nodeDetails[key].dslPath.splice(index,1);
+    nodeDetails[key].dslPathTree.splice(index,1);
+    this.setState({ nodeDetails: nodeDetails });
+ }
+  onNodeCheckbox(e) {
+      var nodeDetails = this.state.nodeDetails;
+      if (e.target.checked) {
+        nodeDetails[e.target.value].isSelected = true;
+        this.selectAll(e.target.value);
+      }else {
+        nodeDetails[e.target.value].isSelected = false;
+        this.deselectAll(e.target.value);
+      }
+      // update the state with the new array of traverse to nodes
+      this.setState({ nodeDetails: nodeDetails });
+  }
+  onNodeRadio(e) {
+      var nodeDetails = this.state.nodeDetails;
+      if (e.target.checked) {
+        nodeDetails[e.target.value].isSelected = true;
+        this.selectAll(e.target.value);
+      }
+      for (var key in nodeDetails) {
+          if(key != e.target.value && nodeDetails[key].isSelected ){
+            nodeDetails[key].isSelected = false;
+            this.deselectAll(key);
+          }
+      }
+      // update the state with the new array of traverse to nodes
+      this.setState({ nodeDetails: nodeDetails });
+  }
+  onAutoZoomCheckbox(e) {
+      var cbValue = false;
+      if (e.target.checked) {
+        cbValue = true;
+      }else {
+        cbValue = false;
+      }
+      this.setState({ autoZoomEnabled: cbValue });
+  }
+  onAggregateCheckbox(e) {
+      var cbValue = false;
+      if (e.target.checked) {
+        cbValue = true;
+      }else {
+        cbValue = false;
+      }
+      this.setState({ aggregateObjects: cbValue });
+  }
+  onAttributeCheckbox(e){
+        let splitVal = e.target.value.split("|");
+        let nodeKey = splitVal[0];
+        let attrValue = splitVal[1];
+        let nodeDetails = this.state.nodeDetails;
+        let node = nodeDetails[nodeKey];
+        let attribute = null;
+        if(!node.attrDetails){
+            node.attrDetails = [];
+        }
+        if(!node.attrDetails[attrValue]){
+            node.attrDetails[attrValue] = {};
+            node.attrDetails[attrValue].isSelected = true;
+            node.attrDetails[attrValue].filterValue = [];
+            node.attrDetails[attrValue].filterType = [];
+            node.attrDetails[attrValue].dslPath = [];
+            node.attrDetails[attrValue].dslPathTree = [];
+        }
+
+        // check if the check box is checked or unchecked
+        if (e.target.checked) {
+          // add the value of the checkbox to nodes array
+          node.attrDetails[attrValue].isSelected = true;
+          node.attrDetails[attrValue].filterType[0]='EQ';
+        } else {
+          // or remove the value from the unchecked checkbox from the array
+          node.attrDetails[attrValue].isSelected = false;
+          //node.attrDetails[attrValue].filterType = [''];
+          //node.attrDetails[attrValue].filterValue = [''];
+        }
+        nodeDetails[nodeKey] = node;
+        // update the state with the new array of traverse to nodes
+        this.setState({ nodeDetails: nodeDetails });
+  }
+  onFilterValueChange(e, nodeKey, attrKey, indx){
+        let nodeDetails = this.state.nodeDetails;
+        let node = nodeDetails[nodeKey];
+        if(!node.attrDetails){
+            node.attrDetails = [];
+        }
+        if(!node.attrDetails[attrKey]){
+            node.attrDetails[attrKey] = {};
+            node.attrDetails[attrKey].isSelected = true;
+            node.attrDetails[attrKey].filterValue = [];
+            node.attrDetails[attrKey].filterType = [];
+            node.attrDetails[attrValue].dslPath = [];
+            node.attrDetails[attrValue].dslPathTree = [];
+        }
+        // add the value of the checkbox to nodes array
+        //node.attrDetails[attrKey].filterValue.push(e.target.value);
+        let filterValArr=node.attrDetails[attrKey].filterValue;
+        filterValArr[indx]=e.target.value;
+        node.attrDetails[attrKey].filterValue=filterValArr;
+        nodeDetails[nodeKey] = node;
+        // update the state with the new array of traverse to nodes
+        this.setState({ nodeDetails: nodeDetails });
+  }
+  submitNodeModal = () =>{
+    if(this.state.selectedNode){
+        var d = this.state.selectedNode;
+        for(var node in this.state.nodeDetails){
+            if(this.state.nodeDetails[node].isSelected){
+                var newNodeObj = {
+                          	type: 'node',
+                            name: this.state.nodeDetails[node].nodeType,
+                            details: {}
+                          };
+                 //Creates new Node
+                 Object.assign(newNodeObj.details, this.state.nodeDetails[node]);
+                 var newNode = d3.hierarchy(newNodeObj);
+                 newNode.depth = d.depth + 1;
+                 newNode.height = d.height - 1;
+                 newNode.parent = d;
+                 newNode.id = node;
+                 if(!d.children){
+                    d.children = [];
+                 }
+                if(newNodeObj.details){
+                   var selectedAttributeCount = 0;
+                   for (var key in newNodeObj.details.attrDetails){
+                        if (newNodeObj.details.attrDetails[key].isSelected){
+                            selectedAttributeCount++;
+                        }
+                        if(selectedAttributeCount === Object.keys(newNodeObj.details.attrDetails).length){
+                           newNodeObj.details.includeInOutput = true;
+                        }
+                   }
+                }
+                 d.children.push(newNode);
+                 this.setState({ nodeDetails: [] });
+        }
+      }
+      this.update(this, d);
+      this.setState({
+          	showNodeModal: false,
+          	enableModalFeedback: false,
+          	traverseToNodes: [],
+          	selectedNode: null
+       });
+    }else{
+        var nodeType = "";
+        var attrDetails = null;
+        var dslPath =[];
+        var dslPathTree=[];
+        for (var key in this.state.nodeDetails) {
+            if(this.state.nodeDetails[key].isSelected){
+              nodeType = this.state.nodeDetails[key].nodeType;
+              attrDetails = this.state.nodeDetails[key].attrDetails;
+              dslPath =this.state.nodeDetails[key].dslPath;
+              dslPathTree=this.state.nodeDetails[key].dslPathTree;
+            }
+        }
+       this.build(nodeType, null, attrDetails,null,dslPath,dslPathTree);
+       this.setState({ nodeDetails: [], showNodeModal: false, enableModalFeedback:false, traverseToNodes: [], selectedNode: null });
+    }
+  }
+  submitEditNodeModal  = () =>{
+    this.update(this, this.state.selectedNode);
+    this.setState({showEditNodeModal: false,showPathFilterDslBuilder:false});
+  }
+  populateEdgeRules = (nodeType) => {
+        let  nodeDetails=GeneralCommonFunctions.populateEdgeRules(nodeType,this.state.edgeRules);
+  	    this.setState({
+        	nodeDetails: nodeDetails
+        });
+  }
+ 
+  buildOXMAttributesAndReturn = (nodeType) =>{
+    var oxmArray = [];
+    var result = JSON.parse(OXM);
+    var arrayOfTypes = result['xml-bindings']['java-types'][0]['java-type'];
+    for (var i = 0; i < arrayOfTypes.length; i++) {
+        var propertiesDsl = [];
+        for (var j = 0; j < arrayOfTypes[i]['java-attributes'][0]['xml-element'].length; j++) {
+            let property =  arrayOfTypes[i]['java-attributes'][0]['xml-element'][j]['$']['name'];
+            let type = arrayOfTypes[i]['java-attributes'][0]['xml-element'][j]['$']['type'];
+            if (type === 'java.lang.String' || type === 'java.lang.Boolean') {
+                propertiesDsl[property] = {};
+                propertiesDsl[property].isSelected = false;
+                propertiesDsl[property].attributeName = property;
+                propertiesDsl[property].filterValue = [''];
+                propertiesDsl[property].filterType = [''];
+                propertiesDsl[property].dslPath = [];
+                propertiesDsl[property].dslPathTree = [];
+            }
+        }
+        let sortedPropertiesDsl = propertiesDsl.sort(function (filter1, filter2) {
+        	if (filter1.attributeName < filter2.attributeName) {
+        		return -1;
+        	} else if (filter1.attributeName > filter2.attributeName) {
+        		return 1;
+        	} else {
+        		return 0;
+        	}
+        });
+        oxmArray[GeneralCommonFunctions.camelToDash(arrayOfTypes[i]['xml-root-element'][0]['$']['name'])] = sortedPropertiesDsl;
+    }
+    this.setState({oxmMapping: oxmArray});
+    return oxmArray[nodeType];
+  }
+
+  runDSL = () => {
+    console.log("running DSL");
+    let paramToPassThrough = '';
+    if(this.state.aggregateObjects){
+        paramToPassThrough = '/customDsl/built-aggregate/' + btoa('<pre>' + this.state.dslQuery + '</pre>');
+    }else{
+        paramToPassThrough = '/customDsl/built/' + btoa('<pre>' + this.state.dslQuery + '</pre>');
+    }
+    this.props.history.push(paramToPassThrough);
+  }
+  submitEditAndRunDSL = () =>{
+    this.setState({ dslQuery: this.state.editModel }, () => this.runDSL());
+  }
+  showEditDSLModal = () => {
+    console.log("enabling DSL edit modal");
+    this.setState({ editModel: this.state.dslQuery, showEditModal: true });
+  }
+  closeEditDSLModal = () => {
+    console.log("closing DSL edit modal");
+    this.setState({ showEditModal: false });
+  }
+  bindEdits = (e) => {
+    this.setState({ editModel: e.target.value });
+  }
+  populateDSL = (tree, isInit) =>{
+        var DSL = '';
+        var treeArray = '';
+        var treeArrayLength = 0;
+        if(isInit){
+            treeArray = tree;
+            treeArrayLength = 1;
+        }else{
+            treeArray = tree.children;
+            treeArrayLength = tree.children.length;
+        }
+        for(var k = 0; treeArray && k < treeArrayLength; k++){
+            if(k === 0 && treeArrayLength > 1){
+                DSL += '[';
+            }
+            var node = '';
+            if(isInit){
+                node = tree;
+            }else{
+                node = treeArray[k];
+            }
+            if(node.data){
+                console.log('Node data while rendering DSl path>>',JSON.stringify(node.data));
+                DSL += node.data.name;
+                let propState=false;
+                if(node.data.details){
+                    var tempAttributeString = '';
+                    var selectedAttributeCount = 0;
+                    for (var key in node.data.details.attrDetails){
+                        if (node.data.details.attrDetails[key].isSelected){
+                            selectedAttributeCount++;
+                            let aliasWithProp=node.data.details.attrDetails[key].attributeName;
+                            if(node.data.details.attrDetails[key].alias){
+                                aliasWithProp= aliasWithProp+'\' as \''+node.data.details.attrDetails[key].alias;
+                            }
+                            if(selectedAttributeCount === 1){
+                                tempAttributeString += '{\'' + aliasWithProp +'\'';
+                                propState=true;
+                            }else{
+                                tempAttributeString += ',\'' + aliasWithProp + '\'';
+                            }
+                        }
+                    }
+                    if(selectedAttributeCount === Object.keys(node.data.details.attrDetails).length){
+                        DSL+= '*';
+                    }
+                    if((selectedAttributeCount < Object.keys(node.data.details.attrDetails).length) && propState){
+                        DSL += tempAttributeString + '}';
+                    }                    
+                    for (var key in node.data.details.attrDetails){
+                        if(node.data.details.attrDetails[key].filterValue && node.data.details.attrDetails[key].filterValue[0] !==''){
+                            DSL += '(\'' + node.data.details.attrDetails[key].attributeName + '\',';
+                            let dslValues='';
+                            for(var indx=0; indx<node.data.details.attrDetails[key].filterValue.length; indx++){                            
+                                dslValues=(indx>0) ? dslValues+',':dslValues;
+                                if(this.state.enableRealTime && node.data.details.attrDetails[key].filterType && node.data.details.attrDetails[key].filterType[indx]){
+                                    dslValues += node.data.details.attrDetails[key].filterType[indx]+'(\''+ node.data.details.attrDetails[key].filterValue[indx] + '\')';                                    
+                                }else{
+                                    dslValues +='\''+node.data.details.attrDetails[key].filterValue[indx] + '\'';                                    
+                                }                      
+                                if(node.data.details.attrDetails[key].filterValue.length-1 ===  indx){
+                                    dslValues +=')';
+                                }
+                            }                        
+                            DSL += dslValues;
+                        }
+                    }
+                    if(node.data.details.dslPath && node.data.details.dslPath.length>0){
+                        for(var n in node.data.details.dslPath){
+                            DSL += node.data.details.dslPath[n];
+                        }                        
+                    }
+                }
+            }
+            if(node.children){
+                DSL+= '>' + this.populateDSL(node);
+            }
+            if(k !==  treeArrayLength - 1){
+                DSL += ',';
+            }
+            if(k === treeArrayLength - 1 && treeArrayLength > 1){
+                DSL += ']';
+            }
+        }
+        return DSL;
+  }
+  update = (base, source, isInit) => {
+
+        // Assigns the x and y position for the nodes
+        var treeData = base.state.treemap(base.state.root);
+
+        var DSL = base.populateDSL(treeData, true);
+        console.log(JSON.stringify("DSL :" + DSL));
+
+        this.setState({ dslQuery: DSL });
+
+        // Compute the new tree layout.
+        var nodes = treeData.descendants(),
+            links = treeData.descendants().slice(1);
+
+        var list1 = d3.selectAll(".fa")
+            .filter(".fa-plus")
+            .style("display", "block");
+
+        // Normalize for fixed-depth.
+        nodes.forEach(function(d){ d.y = d.depth * 100});
+        // ****************** Nodes section ***************************
+
+        // Update the nodes...
+        var node = base.state.g.selectAll('g.node')
+            .data(nodes, function(d) {return d.id });
+
+        // Enter any new modes at the parent's previous position.
+        var nodeEnter = node.enter().append('g')
+            .attr('class', 'node')
+            .attr("transform", function(d) {
+              return "translate(" + source.y0 + "," + source.x0 + ")";
+          })
+         // .on('click', click)
+          .on('dblclick', doubleClick);
+
+        // Add Circle for the nodes
+        nodeEnter.append('circle')
+            .attr('class', 'node')
+            .attr('r', 1e-6)
+            .style("fill", "lightsteelblue");
+        nodeEnter.append("svg:foreignObject")
+                .attr("width", 20)
+                .attr("height", 25)
+                .attr("y", -14)
+                .attr("x", -10)
+            .append("xhtml:span")
+        	     .attr("class", function (d) {
+        	                    let icon = '';
+        	                    if(!INVLIST.IS_ONAP){
+        	                        icon = 'icon-datanetwork-serverL';
+        	                    }else{
+        	                        icon = 'browse-fa fa fa-server';
+        	                    }
+        	                    if(d.data.details && d.data.details.parentContainer){
+        	                        var iconKey = ((d.data.details.parentContainer).replace(/-/g, '')).toUpperCase();
+        	                        if(INVLIST.INVENTORYLIST[iconKey] && INVLIST.INVENTORYLIST[iconKey].icon){
+        	                            return INVLIST.INVENTORYLIST[iconKey].icon;
+        	                        }else{
+        	                            return icon;
+        	                        }
+        	                    }else{
+        	                        return icon;
+        	                    }
+        	      })
+                 .style("font-size", function (d) {
+                                     if (!INVLIST.IS_ONAP){
+                                        return "20px";
+                                     } else {
+                                        return "16px";
+                                     }
+                 })
+                 .attr("id", function (d) {return "nodeIcon" + d.id})
+                 .style("color", '#387dff')
+                 .style("display", "block")
+                 .style("padding-top",function(d){
+                                      if (!INVLIST.IS_ONAP){
+                                        return "0px";
+                                      } else {
+                                        return "8px";
+                                      }
+                 });
+
+        nodeEnter.append("svg:foreignObject")
+                .attr("width", 6)
+                .attr("height", 6)
+                .attr("y", 10)
+                .attr("x", -10)
+                .on('click', function (d) {
+                    if(d.data.details.isRootNode){
+                        d = null;
+                        base.resetBuilder();
+                    }else{
+                        for(var i = 0; d.parent.children && i < d.parent.children.length; i++){
+                            if (d.parent.children.length > 1 && d.data.name === d.parent.children[i].data.name){
+                                d.parent.children.splice(i, 1);
+                            }else if (d.parent.children.length === 1 && d.data.name === d.parent.children[i].data.name){
+                                d.parent.children = null;
+                            }
+                        }
+                        base.update(base, d);
+                    }
+                })
+            .append("xhtml:span")
+        	     .attr("class", "fa fa-minus")
+        	     .style("padding-top", "1px")
+                 .style("font-size", function (d){ return "5px";})
+                 .attr("id", function (d) {return "nodeDelete" + d.data.id})
+                 .style("color", '#387dff')
+                 .style("display", function (d) {return "block";});
+        nodeEnter.append("svg:foreignObject")
+                         .attr("width", 6)
+                         .attr("height", 6)
+                         .attr("y", 10)
+                         .attr("x", 5)
+                         .on('click', function (d) { base.setState({enableModalFeedback: true}, function () {setTimeout(() => {add(d)},1);})})
+                     .append("xhtml:span")
+                 	      .attr("class", "fa fa-plus")
+                 	      .style("padding-top", "1px")
+                          .style("font-size", function (d){ return "5px";})
+                          .attr("id", function (d) {return "nodeAdd" + d.data.id})
+                          .style("color", '#387dff');
+        nodeEnter.append("svg:foreignObject")
+                                 .attr("width", 6)
+                                 .attr("height", 6)
+                                 .attr("y", -17)
+                                 .attr("x", -10)
+                                 .on('click', function (d) { edit(d)})
+                             .append("xhtml:span")
+                         	      .attr("class", "fa fa-pencil-square")
+                         	      .style("padding-top", "1px")
+                                  .style("font-size", function (d){ return "5px";})
+                                  .attr("id", function (d) {return "nodeEdit" + d.data.id})
+                                  .style("color", '#387dff');
+        // Add labels for the nodes
+        nodeEnter.append("svg:foreignObject")
+                  .attr("width", 60)
+                  .attr("height", 40)
+                  .attr("y", -10)
+                  .attr("x", -75)
+                  .append("xhtml:span")
+                  .append('text')
+                    .attr("dy", ".35em")
+                    .attr("x", function(d) {
+                        return d.children ? -13 : 13;
+                    })
+                    .text(function(d) { return d.data.name; })
+                    .style("float","right")
+                    .style("color", '#000000');
+
+        // UPDATE
+        var nodeUpdate = nodeEnter.merge(node);
+        var postNodeDrawnCallBack = function (d){
+          if(!isInit && base.state.autoZoomEnabled || d.data.details.isRootNode){
+             base.state.zoomFit();
+          }
+        }
+        // Transition to the proper position for the node
+        nodeUpdate.transition()
+          .duration(base.state.duration)
+          .attr("transform", function(d) {
+              return "translate(" + d.y + "," + d.x + ")"
+           }).on("end", postNodeDrawnCallBack);
+
+        // Update the node attributes and style
+        nodeUpdate.select('circle.node')
+          .attr('r', 11)
+          .style("fill", "lightsteelblue")
+          .attr('cursor', 'pointer');
+
+
+        // Remove any exiting nodes
+        var nodeExit = node.exit().transition()
+            .duration(base.state.duration)
+            .attr("transform", function(d) {
+                return "translate(" + source.y + "," + source.x + ")";
+            })
+            .remove();
+
+        // On exit reduce the node circles size to 0
+        nodeExit.select('circle')
+          .attr('r', 1e-6);
+
+        // On exit reduce the opacity of text labels
+        nodeExit.select('text')
+          .style('fill-opacity', 1e-6);
+
+        // ****************** links section ***************************
+
+        // Update the links...
+        var link = base.state.g.selectAll('path.link')
+            .data(links, function(d) { return d.id; });
+
+        // Enter any new links at the parent's previous position.
+        var linkEnter = link.enter().insert('path', "g")
+            .attr("class", "link")
+            .attr('d', function(d){
+              var o = {x: source.x0, y: source.y0}
+              return diagonal(o, o)
+            });
+
+        // UPDATE
+        var linkUpdate = linkEnter.merge(link);
+
+        // Transition back to the parent element position
+        linkUpdate.transition()
+            .duration(base.state.duration)
+            .attr('d', function(d){ return diagonal(d, d.parent) });
+
+        // Remove any exiting links
+        var linkExit = link.exit().transition()
+            .duration(base.state.duration)
+            .attr('d', function(d) {
+              var o = {x: source.x, y: source.y}
+              return diagonal(o, o)
+            })
+            .remove();
+
+        // Store the old positions for transition.
+        nodes.forEach(function(d){
+          d.x0 = d.x;
+          d.y0 = d.y;
+        });
+
+        // Creates a curved (diagonal) path from parent to the child nodes
+        function diagonal(s, d) {
+          var path = 'M ' + s.y + ' ' + s.x + ' C ' + ((s.y + d.y) / 2) + ' ' + s.x + ' ' +  (s.y + d.y) / 2 + ' ' + d.x + ' ' + d.y + ' ' + d.x;
+          return path
+        }
+        base.state.svg.on("dblclick.zoom", null);
+        // Toggle children on click.
+        function add(d){
+            base.populateEdgeRules(d.data.name,base.state.edgeRules);
+            if(!d.children){
+              d.children = [];
+              d.data.children = [];
+            }
+            base.setState({
+              selectedNode: d,
+              showNodeModal: true,
+              enableModalFeedback: false
+            });
+
+        }
+        function edit(d){
+            console.log("object editing: " + d);
+            var nodeDetails = base.state.nodeDetails;
+            //set up node details to have the node to edit
+            if(d.data.details.isRootNode && base.props.match.params.type){
+                var attributes = GeneralCommonFunctions.getFilteringOptions(d.data.details.nodeType);
+                if(Object.keys(attributes).length > 0){
+                    nodeDetails[0] = {};
+                    nodeDetails[0].isRootNode = true;
+                    nodeDetails[0].nodeType = base.props.match.params.type;
+                    nodeDetails[0].isSelected = true;
+                    nodeDetails[0].attrDetails = attributes;
+                    if(base.state.initialRootEdit){
+                        for (var key in nodeDetails[0].attrDetails) {
+                            nodeDetails[0].attrDetails[key].isSelected = true;
+                        }
+                    }
+                    nodeDetails[0].parentContainer = GeneralCommonFunctions.populateContainer(base.props.match.params.type);
+                    for (var key in d.data.details.attrDetails) {
+                        nodeDetails[0].attrDetails[key] = d.data.details.attrDetails[key];
+                        if(base.state.initialRootEdit){
+                            nodeDetails[0].attrDetails[key].filterType = [];
+                            nodeDetails[0].attrDetails[key].filterType.push('EQ');
+                        }
+                    }
+                }
+                d.data.details = nodeDetails[0];
+                base.setState({
+                  initialRootEdit: false
+                });
+            }else{
+                nodeDetails[0] = d.data.details;
+            }
+            base.setState({
+              selectedNode: d,
+              showEditNodeModal: true,
+              showPathFilterDslBuilder: false
+            });
+        }
+        function doubleClick(d) {
+            edit(d);
+        }
+      }
+  selectAll = (nodeKey) =>{
+    var nodeDetails = this.state.nodeDetails;
+    for (var key in nodeDetails[nodeKey].attrDetails) {
+        nodeDetails[nodeKey].attrDetails[key].isSelected = true;
+    }
+    this.setState({nodeDetails: nodeDetails});
+  }
+  deselectAll = (nodeKey) =>{
+    var nodeDetails = this.state.nodeDetails;
+    for (var key in nodeDetails[nodeKey].attrDetails) {
+        nodeDetails[nodeKey].attrDetails[key].isSelected = false;
+    }
+    this.setState({nodeDetails: nodeDetails});
+  }
+  build = (type, propID, attrDetails, preBuiltTree,dslPath,dslPathTree) =>{
+    var selected = null;
+    var treeData;
+    if(!preBuiltTree && type && (propID || attrDetails)){
+        let nodeType =  type;
+        treeData = {
+            "name": nodeType,
+            "id": nodeType,
+            "children": [],
+            "details":{},
+            "dslPath":[],
+            "dslPathTree":[]
+        }
+        treeData.details.includeInOutput = true;
+        treeData.details.isSelected = true;
+        treeData.details.isRootNode = true;
+        treeData.details.nodeType = nodeType;
+        if(attrDetails){
+            treeData.details.attrDetails = attrDetails;
+        } else{
+            treeData.details.attrDetails = {};
+        }        
+        if(dslPath && dslPath.length>0 && dslPathTree && dslPathTree.length>0){
+            treeData.details.dslPath=dslPath;
+            treeData.details.dslPathTree=dslPathTree;
+        }
+        if(propID){
+            let propIds = (propID) ? propID.split(';') : '';
+            let propertyValue = '';
+            for(var i  in propIds){
+            	let propValue = propIds[i].split(':');
+            	console.log(propValue[0] + '....' + propValue[1]);
+            	treeData.details.attrDetails[propValue[0]] = {};
+                treeData.details.attrDetails[propValue[0]].filterValue=[];
+                treeData.details.attrDetails[propValue[0]].filterValue.push(atob(propValue[1]).replace('<pre>','').replace('</pre>',''));
+                treeData.details.attrDetails[propValue[0]].attributeName = propValue[0];
+                treeData.details.attrDetails[propValue[0]].isSelected = true;
+            }
+        }
+    }else if (preBuiltTree){
+        treeData = preBuiltTree;
+        if(treeData.details && treeData.details.dslPathTree && treeData.details.dslPathTree.length>0){
+            for(var x=0;x<treeData.details.dslPathTree.length;x++){
+                treeData.details.dslPath.push(GeneralCommonFunctions.populatePathDSL(treeData.details.dslPathTree[x],true,true,this.state.enableRealTime));
+            }
+        }
+        if(treeData.children && treeData.children.length>0){
+            for(var x=0;x<treeData.children.length;x++){               
+               treeData.children[x]=this.updateDslPathValueOnExtract(treeData.children[x]);
+            }
+        }
+    }
+
+    // append the svg object to the body of the page
+    // appends a 'group' element to 'svg'
+    // moves the 'group' element to the top left margin
+    var svg = d3.select("#DSLBuilder");
+    // Set the dimensions and margins of the diagram
+
+    var margin = {top: 20, right: 120, bottom: 20, left: 120},
+           width = +svg.attr("width") - margin.right - margin.left,
+           height = +svg.attr("height") - margin.top - margin.bottom;
+
+    var g = svg.append("g")
+        .attr("transform", "translate("
+              + margin.left + "," + margin.top + ")");
+
+    var duration = 750,
+        root;
+
+    // declares a tree layout and assigns the size
+    var treemap = d3.tree().size([height - 200, width]);
+
+    // Assigns parent, children, height, depth
+    root = d3.hierarchy(treeData, function(d) { return d.children; });
+    root.x0 = height / 2;
+    root.y0 = 0;
+
+    //Zoom functions
+    function zoom_actions(){
+        g.attr("transform", d3.event.transform)
+    }
+    //add zoom capabilities
+    var zoom_handler = d3.zoom()
+        .on("zoom", zoom_actions);
+
+    zoom_handler(svg);
+
+    function zoomFit() {
+      var bounds = g.node().getBBox();
+      var parent = g.node().parentElement;
+      if(bounds && parent){
+        var fullWidth = parent.clientWidth || parent.parentNode.clientWidth,
+            fullHeight = parent.clientHeight || parent.parentNode.clientHeight;
+        var width = bounds.width,
+            height = bounds.height;
+        var midX = bounds.x + width / 2,
+            midY = bounds.y + height / 2;
+        if (width == 0 || height == 0) return; // nothing to fit
+        var scale = Math.min((0.95 / Math.max(width / fullWidth, height / fullHeight)), 4);
+        var translate = [fullWidth / 2 - scale * midX, fullHeight / 2 - scale * midY];
+
+        var transform = d3.zoomIdentity
+            .translate(300, translate[1])
+            .scale(scale);
+        svg.transition().duration(350)
+          .call(zoom_handler.transform, transform);
+     }
+
+    }
+
+    //Set Default zoom
+    svg.call(zoom_handler)
+    .call(zoom_handler.transform, d3.zoomIdentity.translate(80, -1000).scale(4));
+    this.setState({
+            init: false,
+        	svg: svg,
+        	g: g,
+        	treemap: treemap,
+        	root: root,
+        	duration: duration,
+        	zoomFit: zoomFit
+        }, ()=>{this.update(this, root, true);})
+
+    // Collapse the node and all it's children
+    function collapse(d) {
+      if(d.children) {
+        d.children.forEach(collapse)
+        d.children = null
+      }
+    }
+  }
+  
+  updateDslPathValueOnExtract=(treeDataChildren)=>{                   
+    if(treeDataChildren.details && treeDataChildren.details.dslPathTree && treeDataChildren.details.dslPathTree.length>0){
+        for(var x=0;x<treeDataChildren.details.dslPathTree.length;x++){
+            let dsl=GeneralCommonFunctions.populatePathDSL(treeDataChildren.details.dslPathTree[x],true,true,this.state.enableRealTime);
+            treeDataChildren.details.dslPath.push(dsl);         
+        }
+    }
+    if(treeDataChildren && treeDataChildren.children && treeDataChildren.children.length>0){
+        for(var x=0;x<treeDataChildren.children.length;x++){
+            treeDataChildren.children[x]=this.updateDslPathValueOnExtract(treeDataChildren.children[x]);
+        }
+    } 
+    return treeDataChildren;   
+  }
+  onTargetMenuOfFilterTypes=(listname,id)=>{
+    console.log(listname+'onTargetMenuOfFilterTypes',id);
+    let keysOfArray=id.split('#');
+    let nodekey=keysOfArray[0];
+    let attrKey=keysOfArray[1];
+    let indx=parseInt(keysOfArray[2]);
+    let nodeDetails = this.state.nodeDetails;
+    let node = nodeDetails[nodekey];
+    if(!node.attrDetails){
+        node.attrDetails = [];
+    }
+    if(!node.attrDetails[attrKey]){
+        node.attrDetails[attrKey] = {};
+        node.attrDetails[attrKey].isSelected = true;
+        node.attrDetails[attrKey].filterValue = [];
+        node.attrDetails[attrKey].filterType = [];   
+    }else{
+        let filterTypes=node.attrDetails[attrKey].filterType;
+        filterTypes[indx]=listname;
+        node.attrDetails[attrKey].filterType=filterTypes;
+    }    
+    nodeDetails[nodekey] = node;
+    // update the state with the new array of traverse to nodes
+    this.setState({ nodeDetails: nodeDetails });
+  };
+  filterTags = (key,property,state) =>{
+    let filterTags ='';
+    let filters='';
+    state=true;//always enable, in future if wants to disable remove this line
+    if(APERTURE_SERVICE && this.state.enableRealTime){
+        let nodeDetails = this.state.nodeDetails;
+        let node = nodeDetails[key];
+        filterTags= Object.keys(Object.keys(node.attrDetails[property].filterType)).map((indx) =>{
+                    let selectedFilter=(node.attrDetails[property].filterType[indx]!=='')?node.attrDetails[property].filterType[indx]:this.state.filterTypeDisplay;
+                    return <div style={{margin:'0px 0px 0px 5px'}}>
+                        <label>                                       
+                            <FilterTypes param={this.state}
+                            selectedFilter={selectedFilter}
+                            id={key+'#'+property+'#'+indx}
+                            onMenuSelect={this.onTargetMenuOfFilterTypes} 
+                            state={!state}/>
+                        </label>
+                        </div>                        
+                    });
+        filters= <Col md={4} className='removeLeftPadding'>{filterTags}</Col>;                
+    }
+    return filters;
+  };
+  addOrTemplate=(nodeKey,attrKey,indx)=>{
+    let nodeDetails = this.state.nodeDetails;
+    let node = nodeDetails[nodeKey];
+    node.attrDetails[attrKey].filterValue.push('');
+    node.attrDetails[attrKey].filterType.push('EQ');
+    nodeDetails[nodeKey] = node;
+    // update the state with the new array of traverse to nodes
+    this.setState({ nodeDetails: nodeDetails });    
+  };
+  deleteOrTemplate=(nodeKey,attrKey,index)=>{
+    let nodeDetails = this.state.nodeDetails;
+    let node = nodeDetails[nodeKey];
+    let filterValuesArray=node.attrDetails[attrKey].filterValue;
+    let filterTypeArray=node.attrDetails[attrKey].filterType;
+    filterValuesArray.splice(index,1);
+    filterTypeArray.splice(index,1);
+    node.attrDetails[attrKey].filterValue=filterValuesArray;
+    node.attrDetails[attrKey].filterType=filterTypeArray;
+    nodeDetails[nodeKey] = node;
+    this.setState({ nodeDetails: nodeDetails });
+  }
+  toggleRealTimeAnalysisCallback=(checked)=>{
+    console.log('toggleRealTimeAnalysisCallback>>>>',checked);
+    sessionStorage.setItem(ENVIRONMENT + 'ENABLE_ANALYSIS', !checked);
+    this.baseState.enableRealTime=!checked;
+    this.baseState.init= true;
+    this.setState({...this.baseState},()=>{document.getElementById("DSLBuilder").innerHTML='';});
+  }
+  renderPathFilterBuilder=(key,dslPath,dslPathTree)=>{
+    console.log('renderPathFilterBuilder>>>>',key);
+    let attrDetails=this.state.nodeDetails[key].attrDetails; 
+    let nodeType=this.state.nodeDetails[key].nodeType; 
+    this.setState({showPathFilterDslBuilder: true,pathFilterNodeType: key,pathFilterNodeName:nodeType,pathFIlterAttrDetails: attrDetails,dslPathBuilder: dslPath,dslPathTree:dslPathTree,isEditEnable:false});
+  }
+  /* Load Functions */
+  getAndPopulateTreeFromDSL = (dslQuery) =>{
+      var treeObject = [];
+      var payload = {dsl: dslQuery};
+      settings['ISAPERTURE'] = true;
+      commonApi(settings, 'dsl/convert-query-to-tree', 'PUT', payload, 'ConvertQueryToTree')
+                          		.then(res => {
+                          			console.log('res:' + res.data, 'load');
+                          			if(res.status === 200 || res.status === 404){
+                          			    if(res.data.status && (res.data.status !== 200 && res.data.status !== 201 && res.data.status !== 404)){
+                          			        this.triggerError(res.data, 'treeLoad');
+                          			    }else{
+                          			        treeObject = res.data;
+                          			        this.setState({
+                                               enableTreeLoadBusyFeedback:false,
+                                               treeLoadErrMsg: null
+                                               });
+                                            console.log("TREE OBJECT: " + JSON.stringify(treeObject));
+                                            //clear the svg
+                                            if(this.state.svg){
+                                              this.state.svg.selectAll("*").remove();
+                                            }
+                                            //set the init state
+                                            this.setState({init: true, dslQuery: '', initialRootEdit: false, nodeDetails: [], selectedNode: null });
+                                            var initNode = this.extractNodeDetails(treeObject.children[0], true);
+                                            if(!this.state.treeLoadErrMsg || this.state.treeLoadErrMsg === ''){
+                                                console.log(JSON.stringify(initNode));
+                                                this.build(null, null, null, initNode);
+                                                setTimeout(() => { this.state.zoomFit() }, 600);
+                                                //scroll to the hidden static modal since svg offsetTop doesnt work for DSLBuilder id
+                                                GeneralCommonFunctions.scrollTo('customDslBuilderModel');
+                                            }else{
+                                                this.triggerError(null, 'invalidQuery');
+                                            }
+                                        }
+                                    }else{
+                                      this.triggerError(res.data, 'treeLoad');
+                                    }
+                          		}, error=>{
+                          		    if(error.response.status === 404){
+                          		        this.setState({enableTreeLoadBusyFeedback:false});
+                          		    }else{
+                          		        this.triggerError(error.response.data, 'treeLoad');
+                          		    }
+                          		}).catch(error => {
+                          		    this.triggerError(error, 'treeLoad');
+                                })
+
+  };
+  resetBuilder = () => {
+        if(this.state.svg){
+  	        this.state.svg.selectAll("*").remove();
+  	    }
+        this.setState({
+                    init: true,
+                    dslQuery: '',
+                    queryName:'',
+                    queryDescription:'',
+                    initialRootEdit: false,
+                    nodeDetails: [],
+                    selectedNode: null,
+          	        treeLoadErrMsg: '',
+          	        enableTreeLoadBusyFeedback: false,
+          	        aggregateObjects: false
+                    });
+  }
+  triggerError = (error, type) => {
+    console.error('[CustomDslBuilder.jsx] error : ', JSON.stringify(error));
+  	let errMsg = '';
+  	if(error && error.status && error.message){
+  	    errMsg += "Error Occurred: " + error.status + ' - ' +error.message;
+  	}else{
+  	    errMsg += "Error Occurred: " + JSON.stringify(error);
+  	}
+  	console.log(errMsg);
+  	if(type === 'treeLoad' || type === 'invalidQuery'){
+  	    this.resetBuilder();
+  	    var errorMessage = errMsg;
+  	    if(type === 'invalidQuery'){
+  	         errorMessage = 'The loaded query uses DSL syntax not supported by the DSL Builder,'
+                            + ' please only load queries compatible with the builder. For more'
+                            + ' information on this error, please contact an administrator.';
+  	    }
+        this.setState({treeLoadErrMsg: errorMessage});
+        GeneralCommonFunctions.scrollTo('treeLoadErrorMessage');
+    }else{
+        console.log('[CustomDslBuilder.jsx] :: triggerError invoked with invalid type : ' + type);
+    }
+  }
+  validLoadableDSL = (dslQuery) => {
+    var valid = false;
+    dslQuery = dslQuery.replace(/\s/g, '');
+    valid = dslQuery.indexOf(']>') === -1 && !(new RegExp("LIMIT[0-9]+$").test(dslQuery));
+    return valid;
+  }
+  loadCallback = (name, description, category, dslQuery, isAggregate, type, queryId, id, templateDetails, makeCall) =>{
+    var decodedDslQuery = atob(dslQuery).replace('<pre>','').replace('</pre>','');
+    if(this.validLoadableDSL(decodedDslQuery)){
+        if(name !== '' && description !== ''){
+          this.setState({
+  	        queryName:name,
+  	        queryDescription:description,
+  	        category:category,
+  	        isPublicChecked: type === 'public',
+  	        queryId: queryId,
+  	        treeLoadErrMsg: null,
+  	        aggregateObjects: isAggregate === "true"
+          });
+          console.log("DSL Query Loaded: "+ decodedDslQuery);
+          console.log("DSL Query Name: "+ name);
+          console.log("DSL Query Description: "+ description);
+          console.log("DSL Query ID: "+ queryId);
+          console.log("DSL Query Category: "+ category);
+          console.log("DSL Query isAggregate: "+ isAggregate);
+          console.log("DSL Query type: "+ type);
+          var treeObject = this.getAndPopulateTreeFromDSL(decodedDslQuery);
+        }
+    }else{
+        this.triggerError(null, "invalidQuery");
+    }
+  }
+  extractNodeDetails = (node, isRoot) =>{
+    let nodeType =  node['node-type'];
+    let nodeData = {
+        "name": nodeType,
+        "id": nodeType,
+        "children": [],
+        "details":{}
+    }
+    nodeData.details.includeInOutput = node.store;
+    nodeData.details.isSelected = true;
+    nodeData.details.isRootNode = isRoot;
+    nodeData.details.nodeType = nodeType;
+    var attributes = GeneralCommonFunctions.getFilteringOptions(nodeType);
+    nodeData.details.attrDetails = attributes;
+    nodeData.details.parentContainer = GeneralCommonFunctions.populateContainer(nodeType);
+    if(node.store && !node['requested-props']){
+        for(var key in nodeData.details.attrDetails){
+            nodeData.details.attrDetails[key].isSelected = true;
+        }
+    }else if (node.store && node['requested-props']){
+         for(var key in node['requested-props']){
+            nodeData.details.attrDetails[key].isSelected = true;
+            nodeData.details.attrDetails[key].alias=node['requested-props'][key];
+         }
+    }
+    var isValid = true;
+    for (var x in node['node-filter']){
+        if(isValid){
+            for (var y in node['node-filter'][x]) {
+                if(isValid){
+                    var attrKey = node['node-filter'][x][y]['key'];
+                    var filter = node['node-filter'][x][y]['filter'];
+                    //If aperture is not turned on and query loaded uses anything besides EQ throw error
+                    if(!APERTURE_SERVICE && filter !== 'EQ'){
+                        this.triggerError(null, "invalidQuery");
+                        isValid = false;
+                    }
+                    if(!nodeData.details.attrDetails[attrKey]){
+                        nodeData.details.attrDetails[attrKey] = {};
+                    }
+                    if(nodeData.details.attrDetails[attrKey].filterType.length > 0 && nodeData.details.attrDetails[attrKey].filterType[0] === ''){
+                        nodeData.details.attrDetails[attrKey].filterType = [];
+                    }
+                    if(nodeData.details.attrDetails[attrKey].filterValue.length > 0 && nodeData.details.attrDetails[attrKey].filterValue[0] === ''){
+                        nodeData.details.attrDetails[attrKey].filterValue = [];
+                    }
+                    //if a filter had no values associated to it throw a not supported error
+                    if(node['node-filter'][x][y]['value'][0]){
+                        for (var i in node['node-filter'][x][y]['value']){
+                            nodeData.details.attrDetails[attrKey].filterType.push(filter);
+                            nodeData.details.attrDetails[attrKey].filterValue.push(node['node-filter'][x][y]['value'][i]);
+                        }
+                        if(!nodeData.details.attrDetails[attrKey].attributeName){
+                            nodeData.details.attrDetails[attrKey].attributeName = attrKey;
+                        }
+                    }else{
+                        this.triggerError(null, "invalidQuery");
+                        isValid = false;
+                    }
+                }
+            }
+        }
+    }
+    var initWhereNode = null;
+    if(node['where-filter'].length > 0){
+        for(var index in node['where-filter']){
+            initWhereNode = this.extractNodeDetails(node['where-filter'][index].children[0], true);
+        }
+    }
+    if(initWhereNode){
+        nodeData.details.dslPath=[];
+        nodeData.details.dslPathTree=[];
+        nodeData.details.dslPathTree.push(initWhereNode);
+    }
+    if(node.children.length > 0){
+        for(var i = 0; i < node.children.length; i++){
+            nodeData.children[i] = this.extractNodeDetails(node.children[i], false);
+        }
+    }
+    return nodeData;
+  }
+
+  setQueriesState = (savedQueries) =>{
+    this.setState({
+    	loadedQueries: savedQueries
+    });
+  };
+  /* End Load Functions */
+  render(){ 
+    var toggelRealtimeAnalysis = '';
+	if(APERTURE_SERVICE){		
+		  toggelRealtimeAnalysis = <div className='toggleSwitch'><BootstrapSwitchButton
+									checked={!this.state.enableRealTime}
+									onlabel='Real Time'
+									onstyle='danger'
+									offlabel='Analysis'
+									offstyle='success'
+									style='w-100 mx-3'
+									onChange={(checked) => {
+										this.toggleRealTimeAnalysisCallback(checked);
+									}}
+								/></div>             
+	}
+	return(
+        <div>
+            {toggelRealtimeAnalysis}
+	       <div className="addPadding">
+                <div className='row container-fluid my-4'>
+                	<div className='col-lg-9'>
+                		<header className='jumbotron'>
+                                    <h1 className='display-2'>Visual Query Builder for <strong>B</strong>uild <strong>Y</strong>our <strong>O</strong>wn <strong>Q</strong>uery</h1>
+                                    <p className='lead'>
+                                        Visually build your own query, you can click the + icon to add objects to your query,
+                                        - icon to remove objects from your query, or the pencil icon/double click to edit attributes.
+                                        Single click and drag in the view to pan, use scrollwheel or pinch to zoom. <br/>
+                                    </p>
+                        </header>
+                	</div>
+                </div>
+                <div className={'addPaddingTop alert alert-danger ' +(this.state.treeLoadErrMsg && this.state.treeLoadErrMsg !== '' ? 'show' : 'hidden')} id="treeLoadErrorMessage" role="alert">
+                  An error occurred in loading the query. Please see details {this.state.treeLoadErrMsg}
+                </div>
+                <CustomDSLSaveLoad loadCallback={this.loadCallback} setQueriesState={this.setQueriesState} ref={this.saveLoadComponent} isDataSteward={this.state.isDataSteward} isDSLBuilder={true}/>
+                <div className={'row ' + (this.state.init ? 'show' : 'hidden')}>
+                    <button className='btn btn-primary' type='button' onClick={this.initialize.bind(this)}>Start Building (+)</button>
+                </div>
+                <div className={'row ' + (!this.state.init ? 'show' : 'hidden')}>
+                    <button className='btn btn-primary' type='button' onClick={this.runDSL}>Run Query</button>
+                    <button className='btn btn-outline-secondary' type='button' onClick={this.showEditDSLModal}>Manual Edit & Run</button>
+                    <div className={'checkbox ' + (GlobalExtConstants.INVLIST.IS_ONAP ? 'hidden' : '' )}>
+                       <label>
+                         <input type="checkbox" checked={this.state.aggregateObjects} onChange={this.onAggregateCheckbox.bind(this)} />
+                         Aggregate Objects
+                       </label>
+                       <label>
+                         <input type="checkbox" checked={this.state.autoZoomEnabled} onChange={this.onAutoZoomCheckbox.bind(this)} />
+                         Auto Zoom Enabled
+                       </label>
+                    </div>
+                </div>
+
+                <div className='static-modal' id='customDslBuilderModel'>
+            		<Modal show={this.state.showNodeModal} onHide={this.closeNodeModal}>
+            			<Modal.Header>
+            				<Modal.Title>Modify Query</Modal.Title>
+            			</Modal.Header>
+            			    <Modal.Body>
+                              <form>
+                                   {Object.keys(this.state.nodeDetails).sort().map((key, node) => (
+                                        <div className="dsl-panel">
+                                           <Panel>
+                                             <Panel.Heading>
+                                               <Panel.Title>
+                                                 <div className={'checkbox ' + (!this.state.init ? 'show' : 'hidden')}>
+                                                    <label>
+                                                      <input type="checkbox" checked={this.state.nodeDetails[key].isSelected} value={key} onChange={this.onNodeCheckbox.bind(this)} />
+                                                      {this.state.nodeDetails[key].nodeType}
+                                                    </label>
+                                                    <Panel.Toggle>
+                                                      <div className="pull-right">Options</div>
+                                                    </Panel.Toggle>
+                                                 </div>
+                                                 <div className={(this.state.init ? 'show' : 'hidden')}>
+                                                    <label>
+                                                      <input type="radio" value={key} checked={this.state.nodeDetails[key].isSelected} onChange={this.onNodeRadio.bind(this)} />
+                                                      {" " + this.state.nodeDetails[key].nodeType}
+                                                    </label>
+                                                    <Panel.Toggle>
+                                                      <div className="pull-right">Options</div>
+                                                    </Panel.Toggle>
+                                                 </div>
+                                               </Panel.Title>
+                                             </Panel.Heading>
+                                             <Panel.Collapse>
+                                               <Panel.Body className='cardwrap'>
+                                                 <div>
+                                                    <div style={{float:'right'}}>
+                                                        <button type='button' className='btn btn-primary pull-right' onClick={()=>this.renderPathFilterBuilder(key)}>Build Path Filter</button>
+                                                    </div>
+                                                 </div>
+                                                 {this.state.nodeDetails[key].dslPath && this.state.nodeDetails[key].dslPath.length>0 &&
+                                                  <Grid fluid={true} className='addPaddingTop'>
+                                                    <Row className='show-grid addPaddingTop'>
+                                                        <Col md={10}>
+                                                        <strong>DSL PATH Filter</strong>
+                                                        </Col>
+                                                        <Col md={2} className='removeLeftPadding'>
+                                                            <strong>Action</strong>
+                                                        </Col>
+                                                    </Row>
+                                                  </Grid>}
+                                                  <Grid fluid={true}>
+                                                 {this.state.nodeDetails[key].dslPath && Object.keys(this.state.nodeDetails[key].dslPath).map((indx) => {
+                                                    return(
+                                                        <Row className='show-grid'>
+                                                            <Col md={9}>
+                                                                <div style={{float:'left',width:'100%',margin:'10px 0px'}}>
+                                                                    {this.state.nodeDetails[key].dslPath[indx]}
+                                                                </div>
+                                                            </Col>
+                                                            <Col md={3}>
+                                                                     <button
+                                                                        className='btn btn-primary'
+                                                                        style={{padding:'2px',margin:'0px 0px 7px 3px'}}
+                                                                        type='button'
+                                                                        onClick={e => {this.editPathNodeModal(key,this.state.nodeDetails[key].dslPath[indx],this.state.nodeDetails[key].dslPathTree[indx],indx)}}>Edit</button>
+                                                                    <button
+                                                                        className='btn btn-primary'
+                                                                        style={{padding:'2px',margin:'0px 0px 7px 3px'}}
+                                                                        type='button'
+                                                                        onClick={e => {this.deletePathNodeModal(key,this.state.nodeDetails[key].dslPath[indx],this.state.nodeDetails[key].dslPathTree[indx],indx)}}>Delete</button>
+                                                            </Col>
+                                                        </Row>
+                                                    )
+                                                 })}
+                                                 </Grid>
+                                                 <div style={{float:'left'}} className={(GlobalExtConstants.INVLIST.IS_ONAP ? 'hidden' : '' )}>
+                                                        <button type='button' className='btn btn-outline-primary pull-right' onClick={()=>this.deselectAll(key)}>Deselect All</button>
+                                                        <button type='button' className='btn btn-primary pull-right' onClick={()=>this.selectAll(key)}>Select All</button>
+                                                </div>
+                                                 <Grid fluid={true} className='addPaddingTop'>
+                                                    <Row className='show-grid addPaddingTop'>
+                                                       <Col md={(this.state.enableRealTime)?4:6} className={(GlobalExtConstants.INVLIST.IS_ONAP ? 'hidden' : '' )}>
+                                                         <strong>Include in Output</strong>
+                                                       </Col>
+                                                       {APERTURE_SERVICE && this.state.enableRealTime && <Col md={4} className='removeLeftPadding'>
+                                                         <strong>Filter Types</strong>
+                                                       </Col>}
+                                                       <Col md={(this.state.enableRealTime)?4:6} className='removeLeftPadding'>
+                                                          <strong>Filter By (Optional)</strong>
+                                                       </Col>
+                                                    </Row>
+                                                 {Object.keys(this.state.nodeDetails[key].attrDetails).sort().map((attrKey, attr) => {
+                                                    return(
+                                                           <Row className='show-grid'>
+                                                              <Col md={(this.state.enableRealTime)?4:6} className={(GlobalExtConstants.INVLIST.IS_ONAP ? 'hidden' : '' )}>
+                                                               <div className="checkbox">
+                                                                   <label>
+                                                                     <input type="checkbox" checked={this.state.nodeDetails[key].attrDetails
+                                                                     && this.state.nodeDetails[key].attrDetails[attrKey]
+                                                                     && this.state.nodeDetails[key].attrDetails[attrKey].isSelected }
+                                                                     value={key + "|" + attrKey} onChange={this.onAttributeCheckbox.bind(this)} />
+                                                                     {attrKey}
+                                                                   </label>
+                                                                </div>
+                                                              </Col>
+                                                              {this.filterTags(key,attrKey,this.state.nodeDetails[key].attrDetails[attrKey].isSelected)}
+                                                              <Col md={(this.state.enableRealTime)?4:6} className='removeLeftPadding'>
+                                                              {Object.keys(this.state.nodeDetails[key].attrDetails[attrKey].filterValue).map((indx) =>{
+                                                                return(
+                                                                    <div>
+						    			{this.state.nodeDetails[key].attrDetails[attrKey].filterValue[indx] ==='' && <input type="text"
+                                                                            placeholder={"Enter " + attrKey }
+                                                                            className='inputFilter'
+                                                                            onBlur={(e)=>{this.onFilterValueChange(e, key, attrKey,indx);}}
+                                                                            />
+                                                                        }
+                                                                        {this.state.nodeDetails[key].attrDetails[attrKey].filterValue[indx] !=='' && <input type="text"
+                                                                            onChange={(e)=>{this.onFilterValueChange(e, key, attrKey,indx);}}
+                                                                            placeholder={"Enter " + attrKey }
+                                                                            className='inputFilter'
+                                                                            value={this.state.nodeDetails[key].attrDetails[attrKey].filterValue[indx]}
+                                                                            />
+                                                                        }
+                                                                        {indx == 0 && <button
+                                                                            className={(this.state.nodeDetails[key].attrDetails[attrKey].filterValue[indx] !=='')?'btn btn-primary':'btn btn-secondary'}
+                                                                            style={{padding:'2px',margin:'0px 0px 7px 3px'}}
+                                                                            disabled={this.state.nodeDetails[key].attrDetails[attrKey].filterValue[indx]===''}
+                                                                            type='button'
+                                                                            onClick={e => {this.addOrTemplate(key,attrKey,indx)}}>+</button>}
+                                                                        {indx > 0 && <button
+                                                                            style={{padding:'2px',margin:'0px 0px 7px 3px'}}
+                                                                            id={'delete-'+indx}
+                                                                            className='btn btn-danger'
+                                                                            type='button'
+                                                                            onClick={e => {this.deleteOrTemplate(key,attrKey,indx)}}>x</button>}
+
+                                                                    </div>
+                                                                )
+                                                              })}
+
+                                                              </Col>
+                                                           </Row>
+                                                    );
+                                                  }
+                                                 )}
+                                                 </Grid>
+                                               </Panel.Body>
+                                             </Panel.Collapse>
+                                           </Panel>
+                                        </div>
+                                   ))}
+                                 </form>
+                                 <div className={this.state.showPathFilterDslBuilder ? 'show' : 'hidden'}>
+                                    <Modal show={this.state.showPathFilterDslBuilder} onHide={!this.state.showPathFilterDslBuilder} style={{width:'100%'}}>
+                                        <Modal.Header>
+                                            <Modal.Title>Build DSL Path</Modal.Title>
+                                        </Modal.Header>
+                                        <Modal.Body style={{overflow:'scroll'}}>
+                                            <PathFilterDslBuilder  nodeType={this.state.pathFilterNodeType}
+                                                                nodeName={this.state.pathFilterNodeName}
+                                                                attrDetails={this.state.pathFIlterAttrDetails}
+                                                                closePathNodeModal={this.closePathNodeModal}
+                                                                submitPathNodeModal={this.submitPathNodeModal}
+                                                                showPathFilterDslBuilder={this.state.showPathFilterDslBuilder}
+                                                                dslPath={this.state.dslPathBuilder}
+                                                                dslPathTree={this.state.dslPathTree}
+                                                                isEditEnable={this.state.isEditEnable}
+                                                                pathFilterIndex={this.state.pathFilterIndex}/>
+                                        </Modal.Body>
+                                    </Modal>
+                                </div>
+            			    </Modal.Body>
+            			    <Modal.Footer>
+            			    	<Button onClick={this.closeNodeModal}>Close</Button>
+            			    	<Button onClick={this.submitNodeModal}>Submit</Button>
+            			    </Modal.Footer>
+            		</Modal>
+                </div>
+                <div className='static-modal' id='editNodeModel'>
+                	<Modal show={this.state.showEditNodeModal} onHide={this.closeEditNodeModal}>
+                		<Modal.Header>
+                			<Modal.Title>Modify Node</Modal.Title>
+                		</Modal.Header>
+                		<Modal.Body>
+                          <form>
+                            <div className="dsl-panel">
+                               <Panel>
+                                 <Panel.Heading>
+                                   <Panel.Title>
+                                     <div>
+                                        <label>{this.state.selectedNode
+                                                && this.state.selectedNode.data
+                                                && this.state.selectedNode.data.details ?
+                                                this.state.selectedNode.data.details.nodeType
+                                                : ""
+                                               }
+                                        </label>
+                                     </div>
+                                   </Panel.Title>
+                                 </Panel.Heading>
+                                 <Panel.Body className='cardwrap'>                                
+                                    <Grid fluid={true} className='addPaddingTop'>
+                                    <Row className='show-grid addPaddingTop'>
+                                        <div style={{float:'right'}}>
+                                            <button type='button' className='btn btn-primary pull-right' onClick={()=>this.renderPathFilterBuilder(0)}>Build Path Filter</button>
+                                        </div>
+                                    </Row>
+                                    {this.state.selectedNode
+                                        && this.state.selectedNode.data
+                                        && this.state.selectedNode.data.details
+                                        && this.state.nodeDetails[0]
+                                        && this.state.nodeDetails[0].dslPath && this.state.nodeDetails[0].dslPath.length>0 && 
+                                    <Row className='show-grid addPaddingTop'>
+                                        <Col md={10}>
+                                        <strong>DSL PATH Filter</strong>
+                                        </Col>                                                
+                                        <Col md={2} className='removeLeftPadding'>
+                                            <strong>Action</strong>
+                                        </Col>
+                                    </Row>}
+                                    </Grid>                                                                                                                                 
+                                    {this.state.selectedNode
+                                        && this.state.selectedNode.data
+                                        && this.state.selectedNode.data.details
+                                        && this.state.nodeDetails[0]
+                                        && this.state.nodeDetails[0].dslPath && Object.keys(this.state.nodeDetails[0].dslPath).map((indx) => {
+                                    return(
+                                        <Row className='show-grid'>
+                                            <Col md={9}>
+                                                <div style={{float:'left',width:'100%',margin:'10px 0px'}}>
+                                                    {this.state.nodeDetails[0].dslPath[indx]}
+                                                </div>
+                                            </Col>
+                                            <Col md={3}>
+                                                        <button 
+                                                        className='btn btn-primary'
+                                                        style={{padding:'2px',margin:'0px 0px 7px 3px'}}
+                                                        type='button' 
+                                                        onClick={e => {this.editPathNodeModal(0,this.state.nodeDetails[0].dslPath[indx],this.state.nodeDetails[0].dslPathTree[indx],indx)}}>Edit</button>
+                                                    <button 
+                                                        className='btn btn-primary'
+                                                        style={{padding:'2px',margin:'0px 0px 7px 3px'}}
+                                                        type='button' 
+                                                        onClick={e => {this.deletePathNodeModal(0,this.state.nodeDetails[0].dslPath[indx],this.state.nodeDetails[0].dslPathTree[indx],indx)}}>Delete</button>
+                                            </Col>
+                                        </Row>
+                                    )
+                                    })}
+                                    <div style={{float:'left'}} className={(GlobalExtConstants.INVLIST.IS_ONAP ? 'hidden' : '' )}>
+                                        <button type='button' className='btn btn-outline-primary pull-right' onClick={()=>this.deselectAll(0)}>Deselect All</button>
+                                        <button type='button' className='btn btn-primary pull-right' onClick={()=>this.selectAll(0)}>Select All</button>
+                                    </div>
+                                   <Grid fluid={true} className='addPaddingTop'>
+                                      <Row className='show-grid addPaddingTop'>
+                                         <Col md={(this.state.enableRealTime)?4:6} className={(GlobalExtConstants.INVLIST.IS_ONAP ? 'hidden' : '' )}>
+                                           <strong>Include in Output</strong>
+                                         </Col>
+                                         {this.state.enableRealTime && <Col md={4} className='removeLeftPadding'>
+                                           <strong>Filter Types</strong>
+                                         </Col>}
+                                         <Col md={(this.state.enableRealTime)?4:6} className='removeLeftPadding'>
+                                            <strong>Filter By (Optional)</strong>
+                                         </Col>
+                                      </Row>
+                                   {this.state.selectedNode
+                                        && this.state.selectedNode.data
+                                        && this.state.selectedNode.data.details
+                                        && this.state.nodeDetails[0]
+                                        && Object.keys(this.state.nodeDetails[0].attrDetails).sort().map((attrKey, attr) => {
+                                      return(
+                                             <Row className='show-grid'>
+                                                <Col md={(this.state.enableRealTime)?4:6} className={(GlobalExtConstants.INVLIST.IS_ONAP ? 'hidden' : '' )}>
+                                                 <div className="checkbox">
+                                                     <label>
+                                                       <input type="checkbox" checked={this.state.nodeDetails[0].attrDetails
+                                                       && this.state.nodeDetails[0].attrDetails[attrKey]
+                                                       && this.state.nodeDetails[0].attrDetails[attrKey].isSelected }
+                                                       value={0 + "|" + attrKey} onChange={this.onAttributeCheckbox.bind(this)} />
+                                                       {attrKey}
+                                                     </label>
+                                                  </div>
+                                                </Col>
+                                                {this.filterTags(0,attrKey, this.state.nodeDetails[0].attrDetails[attrKey].isSelected)}
+                                                <Col md={(this.state.enableRealTime)?4:6} className='removeLeftPadding'>
+                                                {Object.keys(this.state.nodeDetails[0].attrDetails[attrKey].filterValue).map((indx) =>{
+                                                  return(
+                                                      <div>
+                                                          
+                                                          {this.state.nodeDetails[0].attrDetails[attrKey].filterValue[indx] ==='' && <input type="text"
+                                                              placeholder={"Enter " + attrKey }
+                                                              className='inputFilter'
+                                                              onBlur={(e)=>{this.onFilterValueChange(e, 0, attrKey, indx);}}
+                                                              />
+                                                          }
+                                                          {this.state.nodeDetails[0].attrDetails[attrKey].filterValue[indx] !=='' && <input type="text"
+                                                              onChange={(e)=>{this.onFilterValueChange(e, 0, attrKey,indx);}}
+                                                              placeholder={"Enter " + attrKey }
+                                                              className='inputFilter'
+                                                              value={this.state.nodeDetails[0].attrDetails[attrKey].filterValue[indx]}
+                                                              />
+                                                          }
+                                                          {indx == 0 && <button
+                                                              className={(this.state.nodeDetails[0].attrDetails[attrKey].filterValue[indx]!=='')?'btn btn-primary':'btn btn-secondary'}
+                                                              style={{padding:'2px',margin:'0px 0px 7px 3px'}}
+                                                              disabled={this.state.nodeDetails[0].attrDetails[attrKey].filterValue[indx]===''}
+                                                              type='button'
+                                                              onClick={e => {this.addOrTemplate(0 ,attrKey,indx)}}>+</button>}
+                                                          {indx > 0 && <button
+                                                              style={{padding:'2px',margin:'0px 0px 7px 3px'}}
+                                                              id={'delete-'+indx}
+                                                              className='btn btn-danger'
+                                                              type='button'
+                                                              onClick={e => {this.deleteOrTemplate(0 ,attrKey,indx)}}>x</button>}
+
+                                                      </div>
+                                                  )
+                                                })}
+
+                                                </Col>
+                                             </Row>
+                                      );
+                                    }
+                                   )}
+                                   </Grid>
+                                 </Panel.Body>
+                               </Panel>
+                            </div>
+                          </form>                          
+                          <div className={(this.state.showPathFilterDslBuilder && this.state.showEditNodeModal) ? 'show' : 'hidden'}>
+                                <Modal show={this.state.showPathFilterDslBuilder} onHide={!this.state.showPathFilterDslBuilder} style={{width:'100%'}}>
+                                    <Modal.Header>
+                                        <Modal.Title>Build DSL Path</Modal.Title>
+                                    </Modal.Header>
+                                    <Modal.Body style={{overflow:'scroll'}}>
+                                        <PathFilterDslBuilder  nodeType={this.state.pathFilterNodeType}
+                                                            nodeName={this.state.pathFilterNodeName}
+                                                            attrDetails={this.state.pathFIlterAttrDetails}
+                                                            closePathNodeModal={this.closePathNodeModal}
+                                                            submitPathNodeModal={this.submitPathNodeModal}
+                                                            showPathFilterDslBuilder={this.state.showPathFilterDslBuilder}
+                                                            dslPath={this.state.dslPathBuilder}
+                                                            dslPathTree={this.state.dslPathTree}
+                                                            isEditEnable={this.state.isEditEnable}
+                                                            pathFilterIndex={this.state.pathFilterIndex}/>
+                                    </Modal.Body>
+                                </Modal> 
+                           </div> 
+                		</Modal.Body>
+                		<Modal.Footer>
+                			<Button onClick={this.closeEditNodeModal}>Close</Button>
+                			<Button onClick={this.submitEditNodeModal}>Submit</Button>
+                		</Modal.Footer>
+                	</Modal>
+                </div>
+                <div className='static-modal'>
+                	<Modal show={this.state.showEditModal} onHide={this.closeEditDSLModal}>
+                		<Modal.Header>
+                			<Modal.Title>Edit DSL Query</Modal.Title>
+                		</Modal.Header>
+                		<Modal.Body>
+                            <form>
+                                <FormGroup controlId="dslQuery">
+                                      <ControlLabel>DSL Query</ControlLabel>
+                                      <FormControl onChange={this.bindEdits.bind(this)} value={this.state.editModel} componentClass="textarea" placeholder="Enter DSL Query" />
+                                 </FormGroup>
+                            </form>
+                		</Modal.Body>
+                		<Modal.Footer>
+                			<Button onClick={this.closeEditDSLModal}>Close</Button>
+                			<Button onClick={this.submitEditAndRunDSL}>Submit</Button>
+                		</Modal.Footer>
+                	</Modal>
+                </div>
+                <div>
+                    <div className={'card-header ' + (this.state.queryName && this.state.queryName !== '' ? 'show' : 'hidden')}>
+                    	<div>
+                    		<h3>{this.state.queryName}</h3>
+                    	</div>
+                    </div>
+                    <div className={'card-header ' + (this.state.queryDescription && this.state.queryDescription !== ''  ? 'show' : 'hidden')}>
+                    	<div>
+                    		<h4>{this.state.queryDescription}</h4>
+                    	</div>
+                    </div>
+                    <div className={'card-header ' + (this.state.dslQuery && this.state.dslQuery !== ''  ? 'show' : 'hidden')}>
+                    	<div>
+                    		<h4><strong>DSL Query: </strong><span className='pre-wrap-text'>{this.state.dslQuery}</span></h4>
+                    	</div>
+                    </div>
+                </div>
+                {this.state.enableModalFeedback && <Spinner loading={true}><span height="100%" width="100%"></span></Spinner>}
+                <svg id='DSLBuilder' width='1800' height='800'></svg>
+           </div>
+        </div>
+	);
+  }
+}
+
+export default CustomDslBuilder;
diff --git a/src/app/byoq/PathFilterDslBuilder.jsx b/src/app/byoq/PathFilterDslBuilder.jsx
new file mode 100644
index 0000000..2c6e7bb
--- /dev/null
+++ b/src/app/byoq/PathFilterDslBuilder.jsx
@@ -0,0 +1,1105 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, {Component} from 'react';
+import Modal from 'react-bootstrap/lib/Modal';
+import Grid from 'react-bootstrap/lib/Grid';
+import FormGroup from 'react-bootstrap/lib/FormGroup';
+import FormControl from 'react-bootstrap/lib/FormControl';
+import ControlLabel from 'react-bootstrap/lib/ControlLabel';
+import Button from 'react-bootstrap/lib/Button';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+import Spinner from 'utils/SpinnerContainer.jsx';
+import Row from 'react-bootstrap/lib/Row';
+import Col from 'react-bootstrap/lib/Col';
+import Panel from 'react-bootstrap/lib/Panel';
+import Tooltip from 'react-bootstrap/lib/Tooltip';
+import FilterTypes from 'generic-components/filter/components/FilterTypes.jsx';
+import BootstrapSwitchButton from 'bootstrap-switch-button-react';
+import {GeneralCommonFunctions} from 'utils/GeneralCommonFunctions.js';
+import * as d3 from "d3";
+import 'd3-selection-multi';
+
+
+let EDGERULES = GlobalExtConstants.EDGERULES;
+let OXM = GlobalExtConstants.OXM;
+let INVLIST = GlobalExtConstants.INVLIST;
+let ENVIRONMENT = GlobalExtConstants.ENVIRONMENT;
+let APERTURE_SERVICE = JSON.parse(sessionStorage.getItem(ENVIRONMENT + 'APERTURE_SERVICE'));
+
+let nodeTypes = [];
+let properties = null;
+let traverseRulesDsl = [];
+
+const settings = {
+	'NODESERVER': INVLIST.NODESERVER,
+	'PROXY': INVLIST.PROXY,
+  	'PREFIX': INVLIST.PREFIX,
+  	'VERSION': INVLIST.VERSION,
+    'USESTUBS': INVLIST.useStubs
+};
+class PathFilterDslBuilder extends Component {
+	constructor(props) {
+		console.log('PathFilter props>>>>',props);
+        super(props);
+        APERTURE_SERVICE=JSON.parse(sessionStorage.getItem(ENVIRONMENT + 'APERTURE_SERVICE'));
+		this.state = {edgeRules : null,
+		              showNodeModal: false,
+		              treemap: null,
+		              root: null,
+		              svg: null,
+		              duration: null,
+		              g: null,
+		              selectedNode: null,
+		              traverseToNodes:[],
+		              nodeDetails: [],
+                      dslQuery: '',
+                      dslQueryTree:'',
+		              editModel:'',
+		              showEditModal: false,
+		              zoomFit: null,
+		              autoZoomEnabled: true,
+		              aggregateObjects: false,
+		              init: true,
+		              filterTypeDisplay: 'Filter Type',
+                      selectedfilterType:[],
+                      oxmMapping:null,
+                      closePathNodeModal:true,
+                      submitPathNodeModal:false,
+                      parentNodeType:'',
+                      parentAttrDetails:'',
+                      showPathFilterDslBuilder:false,
+                      dslPath:'',
+                      dslPathTree:null,
+                      isInitialize:true,
+                      treeData:'',
+                      showEditNodeModal:false,
+		      enableRealTime: JSON.parse(sessionStorage.getItem(ENVIRONMENT + 'ENABLE_ANALYSIS'))
+		      }
+	}
+
+  componentDidMount () {
+    console.log('Path Filter componentDidMount',JSON.stringify(this.props));
+    //this.buildSQLStatementsFromSchema();
+    this.processEdgeRules(EDGERULES);    
+  }
+  componentDidUpdate (nextProps) {
+      console.log('Path  Filter componentDidUpdate>>>>>>>',nextProps);
+      if(this.state.isInitialize){
+        this.props=nextProps;
+        console.log('this.props>>>>>>>>>>>>>',this.props);
+        this.setState({submitPathNodeModal:this.props.submitPathNodeModal,
+                closePathNodeModal:this.props.closePathNodeModal,
+                parentNodeType:this.props.nodeType,
+                parentAttrDetails:this.props.attrDetails,
+                showPathFilterDslBuilder:this.props.showPathFilterDslBuilder,
+                dslPath:this.props.dslPath,
+                dslPathTree:this.props.dslPathTree,
+                isInitialize: false},()=>{
+                    if(this.props.dslPathTree){ 
+                        this.build(this.props.nodeType,null,this.props.attrDetails,this.props.dslPathTree);
+                    }else{
+                        //this.initialize(this.props.nodeName);
+                        this.setState({showNodeModal: true,isInitialize:false},()=>{this.populateEdgeRules(this.props.nodeName,this.state.edgeRules)});
+                    }
+                });
+    }
+    console.log('this.state under Update>>>>>',this.state);
+  }
+  componentWillReceiveProps(nextProps) {      
+    console.log('path Filter componentWillReceiveProps>>>>');    
+  }
+  initialize = () => {
+    var nodeDetails = [];
+    var node = null;
+    console.log('initializing');
+    var id = GeneralCommonFunctions.generateID();
+    var nodeTypes = GeneralCommonFunctions.getNodeTypes();
+    for (var i = 0; i < nodeTypes.length; i++) {
+        node = nodeTypes[i] + id;
+        if(this.props.nodeName === nodeTypes[i]){
+            var attributes = GeneralCommonFunctions.getFilteringOptions(nodeTypes[i]);
+            if(!nodeDetails[node] && Object.keys(attributes).length > 0){
+                nodeDetails[node] = {};
+                nodeDetails[node].nodeType = nodeTypes[i];
+                nodeDetails[node].isSelected = false;
+                nodeDetails[node].attrDetails = attributes;
+                nodeDetails[node].parentContainer = GeneralCommonFunctions.populateContainer(nodeTypes[i]);
+            }
+        }
+    }
+    let nodesSorted = nodeDetails.sort(function (filter1, filter2) {
+    	if (filter1.nodeType < filter2.nodeType) {
+    		return -1;
+    	} else if (filter1.nodeType > filter2.nodeType) {
+    		return 1;
+    	} else {
+    		return 0;
+    	}
+    });
+    console.log('Node Types List' + JSON.stringify(nodesSorted));
+    nodeDetails = nodesSorted;
+    this.setState({
+    	nodeDetails: nodeDetails,
+        showNodeModal: true,
+        isInitialize:false
+    });
+  }
+  initialLoadWhileClose= ()=>{
+    this.setState({showNodeModal: true,isInitialize:false},()=>{this.populateEdgeRules(this.props.nodeName,this.state.edgeRules)});                   
+  }
+  processEdgeRules = (data) => {
+  	this.setState({
+  		edgeRules: data.rules
+  	});
+  }
+  closeNodeModal = () =>{
+    this.setState({
+    	showNodeModal: false,
+    	traverseToNodes: [],
+    	selectedNode: null
+    });
+  }
+  onNodeCheckbox(e) {
+      var nodeDetails = this.state.nodeDetails;
+      if (e.target.checked) {
+        nodeDetails[e.target.value].isSelected = true;
+        this.selectAll(e.target.value);
+      }else {
+        nodeDetails[e.target.value].isSelected = false;
+        this.deselectAll(e.target.value);
+      }
+      // update the state with the new array of traverse to nodes
+      this.setState({ nodeDetails: nodeDetails });
+  }
+  onNodeRadio(e) {
+      var nodeDetails = this.state.nodeDetails;
+      if (e.target.checked) {
+        nodeDetails[e.target.value].isSelected = true;
+        this.selectAll(e.target.value);
+      }
+      for (var key in nodeDetails) {
+          if(key != e.target.value && nodeDetails[key].isSelected ){
+            nodeDetails[key].isSelected = false;
+            this.deselectAll(key);
+          }
+      }
+      // update the state with the new array of traverse to nodes
+      this.setState({ nodeDetails: nodeDetails });
+  }
+  onAutoZoomCheckbox(e) {
+      var cbValue = false;
+      if (e.target.checked) {
+        cbValue = true;
+      }else {
+        cbValue = false;
+      }
+      this.setState({ autoZoomEnabled: cbValue });
+  }
+  
+  onAttributeCheckbox(e){//delete
+        let splitVal = e.target.value.split("|");
+        let nodeKey = splitVal[0];
+        let attrValue = splitVal[1];
+        let nodeDetails = this.state.nodeDetails;
+        let node = nodeDetails[nodeKey];
+        let attribute = null;
+        if(!node.attrDetails){
+            node.attrDetails = [];
+        }
+        if(!node.attrDetails[attrValue]){
+            node.attrDetails[attrValue] = {};
+            node.attrDetails[attrValue].isSelected = true;
+            node.attrDetails[attrValue].filterValue = [];
+            node.attrDetails[attrValue].filterType = [];
+        }
+
+        // check if the check box is checked or unchecked
+        if (e.target.checked) {
+          // add the value of the checkbox to nodes array
+          node.attrDetails[attrValue].isSelected = true;
+          node.attrDetails[attrValue].filterType[0]='EQ';
+        } else {
+          // or remove the value from the unchecked checkbox from the array
+          node.attrDetails[attrValue].isSelected = false;
+          node.attrDetails[attrValue].filterType = [''];
+          node.attrDetails[attrValue].filterValue = [''];
+        }
+        nodeDetails[nodeKey] = node;
+        // update the state with the new array of traverse to nodes
+        this.setState({ nodeDetails: nodeDetails });
+  }
+  onFilterValueChange(e, nodeKey, attrKey, indx){
+        let nodeDetails = this.state.nodeDetails;
+        let node = nodeDetails[nodeKey];
+        if(!node.attrDetails){
+            node.attrDetails = [];
+        }
+        if(!node.attrDetails[attrKey]){
+            node.attrDetails[attrKey] = {};
+            node.attrDetails[attrKey].isSelected = true;
+            node.attrDetails[attrKey].filterValue = [];
+            node.attrDetails[attrKey].filterType = [];
+        }
+        // add the value of the checkbox to nodes array
+        //node.attrDetails[attrKey].filterValue.push(e.target.value);
+        let filterValArr=node.attrDetails[attrKey].filterValue;
+        filterValArr[indx]=e.target.value;
+        node.attrDetails[attrKey].filterValue=filterValArr;
+        nodeDetails[nodeKey] = node;
+        // update the state with the new array of traverse to nodes
+        this.setState({ nodeDetails: nodeDetails });
+  }
+  submitPathNodeModal= () =>{
+      console.log('PathFinder submitPathNodeModal>>>>>',this.props);
+      this.props.submitPathNodeModal(this.state.dslQuery,this.props.nodeType,this.state.dslQueryTree,this.props.isEditEnable,this.props.pathFilterIndex);
+  }
+  submitNodeModal = () =>{
+    if(this.state.selectedNode){
+        var treeData=this.state.dslQueryTree;
+        var updatedTreeData='';
+        var d = this.state.selectedNode;
+        for(var node in this.state.nodeDetails){
+            if(this.state.nodeDetails[node].isSelected){
+                var newNodeObj = {
+                          	type: 'node',
+                            name: this.state.nodeDetails[node].nodeType,
+                            id: node,
+                            details: {}
+                          };
+                 //Creates new Node
+                 Object.assign(newNodeObj.details, this.state.nodeDetails[node]);
+                 var newNode = d3.hierarchy(newNodeObj);
+                 newNode.depth = d.depth + 1;
+                 newNode.height = d.height - 1;
+                 newNode.parent = d;
+                 newNode.id = node;
+                 if(!d.children){
+                    d.children = [];
+                 }
+                if(newNodeObj.details){
+                   var selectedAttributeCount = 0;
+                   for (var key in newNodeObj.details.attrDetails){
+                        if (newNodeObj.details.attrDetails[key].isSelected){
+                            selectedAttributeCount++;
+                        }
+                        if(selectedAttributeCount === Object.keys(newNodeObj.details.attrDetails).length){
+                           newNodeObj.details.includeInOutput = true;
+                        }
+                   }
+                }
+                console.log('submit node newNodeObj>>>>>',newNodeObj);
+                treeData=(updatedTreeData==='')?treeData:updatedTreeData;
+		updatedTreeData=this.handlingTreeDataWhileAddRemove(treeData,newNodeObj,d.data.id,d.data.name);
+                 d.children.push(newNode);
+                 this.setState({ nodeDetails: [] });
+        }
+      }
+      this.setState({
+          	showNodeModal: false,
+          	traverseToNodes: [],
+            selectedNode: null,
+            dslQueryTree:updatedTreeData
+       }, ()=>{this.update(this, d)});
+    }else{
+        var nodeType = "";
+        var attrDetails = null;
+        for (var key in this.state.nodeDetails) {
+            if(this.state.nodeDetails[key].isSelected){
+              nodeType = this.state.nodeDetails[key].nodeType;
+              attrDetails = this.state.nodeDetails[key].attrDetails;
+            }
+        }
+       this.build(nodeType, null, attrDetails);
+       this.setState({ nodeDetails: [], showNodeModal: false, traverseToNodes: [], selectedNode: null });
+    }
+  }
+  handlingTreeDataWhileAddRemove = (treeData,addObject,id,name)=>{ 
+    if(addObject===''){
+       if(treeData.children && treeData.children.length>0){            
+            for(var y=0;y<treeData.children.length;y++){   
+                if(treeData.children[y].id=== id  && treeData.children[y].name===name){                                
+                    treeData.children.splice(y,1);                    
+                }else{
+                    treeData.children[y]=this.handlingTreeDataWhileAddRemove(treeData.children[y],'',id,name);
+                }               
+            }
+        } 
+    }else{
+        if(treeData.id === id && treeData.name===name){
+            if(!treeData.children){
+                treeData.children=[];                    
+            }                
+            treeData.children.push(addObject); 
+        }else if(treeData.children && treeData.children.length>0){            
+            for(var y=0;y<treeData.children.length;y++){   
+                if(treeData.children[y].id=== id  && treeData.children[y].name===name){
+                    if(!treeData.children[y].children){
+                        treeData.children[y].children=[];                    
+                    }                
+                    treeData.children[y].children.push(addObject);                    
+                }else{
+                    treeData.children[y]=this.handlingTreeDataWhileAddRemove(treeData.children[y],addObject,id,name);
+                }               
+            }
+        } 
+    }
+    return treeData;
+  }
+
+  populateEdgeRules = (nodeType) => {
+        let  nodeDetails=GeneralCommonFunctions.populateEdgeRules(nodeType,this.state.edgeRules);
+  	    this.setState({
+        	nodeDetails: nodeDetails
+        });
+  }
+  
+  
+  closeEditDSLModal = () => {
+    console.log("closing DSL edit modal");
+    this.setState({ showEditModal: false });
+  }
+  submitEditNodeModal  = () =>{
+    this.update(this, this.state.selectedNode);
+    this.setState({showEditNodeModal: false});
+  }
+  closeEditNodeModal = () =>{
+    this.setState({
+    	showEditNodeModal: false,
+        selectedNode: null
+    });
+  }
+  bindEdits = (e) => {
+    this.setState({ editModel: e.target.value });
+  }
+  
+  update = (base, source, isInit) => {
+
+        // Assigns the x and y position for the nodes
+        var treeData = base.state.treemap(base.state.root);
+
+        var DSL = GeneralCommonFunctions.populatePathDSL(treeData,true,false,this.state.enableRealTime);
+        console.log(JSON.stringify("DSL :" + DSL));
+
+        this.setState({ dslQuery: DSL });
+
+        // Compute the new tree layout.
+        var nodes = treeData.descendants(),
+            links = treeData.descendants().slice(1);
+
+        var list1 = d3.selectAll(".fa")
+            .filter(".fa-plus")
+            .style("display","block");
+
+        // Normalize for fixed-depth.
+        nodes.forEach(function(d){ d.y = d.depth * 100});
+
+        // ****************** Nodes section ***************************
+
+        // Update the nodes...
+        var node = base.state.g.selectAll('g.node')
+            .data(nodes, function(d) {return d.id });
+
+        // Enter any new modes at the parent's previous position.
+        var nodeEnter = node.enter().append('g')
+            .attr('class', 'node')
+            .attr("transform", function(d) {
+              return "translate(" + source.y0 + "," + source.x0 + ")";
+          })
+         // .on('click', click)
+          .on('dblclick', doubleClick);
+
+        // Add Circle for the nodes
+        nodeEnter.append('circle')
+            .attr('class', 'node')
+            .attr('r', 1e-6)
+            .style("fill", function(d) {
+                return d.data.details && d.data.details.includeInOutput ? "lightsteelblue" : "#fff";
+            });
+        nodeEnter.append("svg:foreignObject")
+                .attr("width", 20)
+                .attr("height", 25)
+                .attr("y", -14)
+                .attr("x", -10)
+            .append("xhtml:span")
+        	     .attr("class", function (d) {
+        	                    let icon = '';
+                                if(!INVLIST.IS_ONAP){
+                                    icon = 'icon-datanetwork-serverL';
+                                }else{
+                                    icon = 'browse-fa fa fa-server';
+                                }
+        	                    if(d.data.details && d.data.details.parentContainer){
+        	                        var iconKey = ((d.data.details.parentContainer).replace(/-/g, '')).toUpperCase();
+        	                        if(INVLIST.INVENTORYLIST[iconKey] && INVLIST.INVENTORYLIST[iconKey].icon){
+        	                            return INVLIST.INVENTORYLIST[iconKey].icon;
+        	                        }else{
+        	                            return icon;
+        	                        }
+        	                    }else{
+        	                        return icon;
+        	                    }
+        	      })
+                  .style("font-size", function (d) {
+                                      if (!INVLIST.IS_ONAP){
+                                         return "20px";
+                                      } else {
+                                         return "16px";
+                                      }
+                  })
+                 .attr("id", function (d) {return "nodeIcon" + d.id})
+                 .style("color", '#387dff')
+                 .style("display", "block")
+                 .style("padding-top",function(d){
+                                      if (!INVLIST.IS_ONAP){
+                                        return "0px";
+                                      } else {
+                                        return "8px";
+                                      }
+                 });
+
+        nodeEnter.append("svg:foreignObject")
+                .attr("width", 6)
+                .attr("height", 6)
+                .attr("y", 10)
+                .attr("x", -10)
+                .on('click', function (d) {
+                    if(d.data.details.isRootNode){
+                        d = null;
+                        base.state.svg.selectAll("*").remove();
+                        base.setState({init: true, dslQuery: '',dslQueryTree:''});
+                    }else{
+                        let dslQueryTree=base.state.dslQueryTree; 
+                        for(var i = 0; d.parent.children && i < d.parent.children.length; i++){
+                            if (d.parent.children.length > 1 && d.data.name === d.parent.children[i].data.name){
+                                d.parent.children.splice(i, 1);
+                                dslQueryTree=base.handlingTreeDataWhileAddRemove(dslQueryTree,'',d.data.id,d.data.name);
+                                base.setState({dslQueryTree:dslQueryTree});
+                            }else if (d.parent.children.length === 1 && d.data.name === d.parent.children[i].data.name){
+                                d.parent.children = null;
+                            }
+                        }
+                        base.update(base, d);
+                    }
+                })
+            .append("xhtml:span")
+        	     .attr("class", "fa fa-minus")
+        	     .style("padding-top", "1px")
+                 .style("font-size", function (d){ return "5px";})
+                 .attr("id", function (d) {return "nodeDelete" + d.id})
+                 .style("color", '#387dff')
+                 .style("display", function (d) {return "block";});
+        nodeEnter.append("svg:foreignObject")
+                         .attr("width", 6)
+                         .attr("height", 6)
+                         .attr("y", 10)
+                         .attr("x", 5)
+                         .on('click', function (d) { add(d)})
+                     .append("xhtml:span")
+                 	      .attr("class", "fa fa-plus")
+                          .style("font-size", function (d){ return "5px";})
+                          .style("padding-top", "1px")
+                          .attr("id", function (d) {return "nodeAdd" + d.id})
+                          .style("color", '#387dff');
+        nodeEnter.append("svg:foreignObject")
+                                 .attr("width", 6)
+                                 .attr("height", 6)
+                                 .attr("y", -17)
+                                 .attr("x", -10)
+                                 .on('click', function (d) { edit(d)})
+                             .append("xhtml:span")
+                         	      .attr("class", "fa fa-pencil-square")
+                         	      .style("padding-top", "1px")
+                                  .style("font-size", function (d){ return "5px";})
+                                  .attr("id", function (d) {return "nodeEdit" + d.id})
+                                  .style("color", '#387dff');
+        // Add labels for the nodes
+        nodeEnter.append('text')
+            .attr("dy", ".35em")
+            .attr("x", function(d) {
+                return d.children ? -13 : 13;
+            })
+            .attr("text-anchor", function(d) {
+                return d.children ? "end" : "start";
+            })
+            .text(function(d) { return d.data.name; });
+
+        // UPDATE
+        var nodeUpdate = nodeEnter.merge(node);
+        var postNodeDrawnCallBack = function (d){
+          if(!isInit && base.state.autoZoomEnabled  || d.data.details.isRootNode){
+             base.state.zoomFit();
+          }
+        }
+        // Transition to the proper position for the node
+        nodeUpdate.transition()
+          .duration(base.state.duration)
+          .attr("transform", function(d) {
+              return "translate(" + d.y + "," + d.x + ")"
+           }).on("end", postNodeDrawnCallBack);
+
+        // Update the node attributes and style
+        nodeUpdate.select('circle.node')
+          .attr('r', 11)
+          .style("fill", function(d) {
+              return d.data.details && d.data.details.includeInOutput ? "lightsteelblue" : "#fff";
+          })
+          .attr('cursor', 'pointer');
+
+
+        // Remove any exiting nodes
+        var nodeExit = node.exit().transition()
+            .duration(base.state.duration)
+            .attr("transform", function(d) {
+                return "translate(" + source.y + "," + source.x + ")";
+            })
+            .remove();
+
+        // On exit reduce the node circles size to 0
+        nodeExit.select('circle')
+          .attr('r', 1e-6);
+
+        // On exit reduce the opacity of text labels
+        nodeExit.select('text')
+          .style('fill-opacity', 1e-6);
+
+        // ****************** links section ***************************
+
+        // Update the links...
+        var link = base.state.g.selectAll('path.link')
+            .data(links, function(d) { return d.id; });
+
+        // Enter any new links at the parent's previous position.
+        var linkEnter = link.enter().insert('path', "g")
+            .attr("class", "link")
+            .attr('d', function(d){
+              var o = {x: source.x0, y: source.y0}
+              return diagonal(o, o)
+            });
+
+        // UPDATE
+        var linkUpdate = linkEnter.merge(link);
+
+        // Transition back to the parent element position
+        linkUpdate.transition()
+            .duration(base.state.duration)
+            .attr('d', function(d){ return diagonal(d, d.parent) });
+
+        // Remove any exiting links
+        var linkExit = link.exit().transition()
+            .duration(base.state.duration)
+            .attr('d', function(d) {
+              var o = {x: source.x, y: source.y}
+              return diagonal(o, o)
+            })
+            .remove();
+
+        // Store the old positions for transition.
+        nodes.forEach(function(d){
+          d.x0 = d.x;
+          d.y0 = d.y;
+        });
+
+        // Creates a curved (diagonal) path from parent to the child nodes
+        function diagonal(s, d) {
+          var path = 'M ' + s.y + ' ' + s.x + ' C ' + ((s.y + d.y) / 2) + ' ' + s.x + ' ' +  (s.y + d.y) / 2 + ' ' + d.x + ' ' + d.y + ' ' + d.x;
+          return path
+        }
+        base.state.svg.on("dblclick.zoom", null);
+        // Toggle children on click.
+        function add(d){
+            base.populateEdgeRules(d.data.name,base.state.edgeRules);
+            if(!d.children){
+              d.children = [];
+              d.data.children = [];
+            }
+            base.setState({
+              selectedNode: d,
+              showNodeModal: true
+            });
+
+        }
+        function edit(d){
+            console.log("object editing: " + d);
+            var nodeDetails = base.state.nodeDetails;
+            //set up node details to have the node to edit
+            nodeDetails[0] = d.data.details;
+            base.setState({
+              selectedNode: d,
+              showEditNodeModal: true
+            });
+        }
+        function doubleClick(d) {
+            edit(d);
+        }
+      }
+  selectAll = (nodeKey) =>{//delete
+    var nodeDetails = this.state.nodeDetails;
+    for (var key in nodeDetails[nodeKey].attrDetails) {
+        nodeDetails[nodeKey].attrDetails[key].isSelected = true;
+    }
+    this.setState({nodeDetails: nodeDetails});
+  }
+  deselectAll = (nodeKey) =>{//delete
+    var nodeDetails = this.state.nodeDetails;
+    for (var key in nodeDetails[nodeKey].attrDetails) {
+        nodeDetails[nodeKey].attrDetails[key].isSelected = false;
+    }
+    this.setState({nodeDetails: nodeDetails});
+  }
+  build = (type, propID, attrDetails,preBuiltTree) =>{
+    console.log('build>>>>>>>>',type);
+    var selected = null;
+    var treeData =
+      {
+        "name": "complex",
+        "id": "complex",
+        "children": []
+      };
+    if(!preBuiltTree  && type && (propID || attrDetails)){
+        let nodeType =  type;
+        treeData = {
+            "name": nodeType,
+            "id": nodeType,
+            "children": [],
+            "details":{}
+        }
+        treeData.details.includeInOutput = true;
+        treeData.details.isSelected = true;
+        treeData.details.isRootNode = true;
+        treeData.details.nodeType = nodeType;
+        if(attrDetails){
+            treeData.details.attrDetails = attrDetails;
+        } else{
+            treeData.details.attrDetails = {};
+        }
+        if(propID){
+            let propIds = (propID) ? propID.split(';') : '';
+            let propertyValue = '';
+            for(var i  in propIds){
+            	let propValue = propIds[i].split(':');
+            	console.log(propValue[0] + '....' + propValue[1]);
+            	treeData.details.attrDetails[propValue[0]] = {};
+                treeData.details.attrDetails[propValue[0]].filterValue=[];
+                treeData.details.attrDetails[propValue[0]].filterValue.push(atob(propValue[1]).replace('<pre>','').replace('</pre>',''));
+                treeData.details.attrDetails[propValue[0]].attributeName = propValue[0];
+                treeData.details.attrDetails[propValue[0]].isSelected = true;
+            }
+        }
+    }else if (preBuiltTree){
+        treeData = preBuiltTree;
+    }
+
+    // append the svg object to the body of the page
+    // appends a 'group' element to 'svg'
+    // moves the 'group' element to the top left margin
+    var svg = d3.select("#PathDSLBuilder");
+    // Set the dimensions and margins of the diagram
+    var margin = {top: 20, right: 120, bottom: 20, left: 120},
+           width = +svg.attr("width") - margin.right - margin.left,
+           height = +svg.attr("height") - margin.top - margin.bottom;
+
+    var g = svg.append("g")
+        .attr("transform", "translate("
+              + margin.left + "," + margin.top + ")");
+
+    var duration = 750,
+        root;
+
+    // declares a tree layout and assigns the size
+    var treemap = d3.tree().size([height - 200, width]);
+    // Assigns parent, children, height, depth
+    root = d3.hierarchy(treeData, function(d) { return d.children; });
+    root.x0 = height / 2;
+    root.y0 = 0;
+
+    //Zoom functions
+    function zoom_actions(){
+        g.attr("transform", d3.event.transform)
+    }
+    //add zoom capabilities
+    var zoom_handler = d3.zoom()
+        .on("zoom", zoom_actions);
+
+    zoom_handler(svg);
+
+    function zoomFit() {
+      var bounds = g.node().getBBox();
+      var parent = g.node().parentElement;
+      var fullWidth = parent.clientWidth || parent.parentNode.clientWidth,
+          fullHeight = parent.clientHeight || parent.parentNode.clientHeight;
+      var width = bounds.width,
+          height = bounds.height;
+      var midX = bounds.x + width / 2,
+          midY = bounds.y + height / 2;
+      if (width == 0 || height == 0) return; // nothing to fit
+      var scale = Math.min((0.95 / Math.max(width / fullWidth, height / fullHeight)), 2);
+      var translate = [fullWidth / 2 - scale * midX, fullHeight / 2 - scale * midY];
+
+      var transform = d3.zoomIdentity
+          .translate(80, translate[1])
+          .scale(scale);
+     svg.transition().duration(350)
+        .call(zoom_handler.transform, transform);
+
+    }
+
+    //Set Default zoom
+    svg.call(zoom_handler)
+    .call(zoom_handler.transform, d3.zoomIdentity.translate(80, -500).scale(2));
+    this.setState({
+            init: false,
+        	svg: svg,
+        	g: g,
+        	treemap: treemap,
+        	root: root,
+        	duration: duration,
+            zoomFit: zoomFit,
+            dslQueryTree: treeData
+        }, ()=>{this.update(this, root, true);})
+
+    // Collapse the node and all it's children
+    function collapse(d) {
+      if(d.children) {
+        d.children.forEach(collapse)
+        d.children = null
+      }
+    }
+
+
+  }
+  onTargetMenuOfFilterTypes=(listname,id)=>{
+    console.log(listname+'onTargetMenuOfFilterTypes',id);
+    let keysOfArray=id.split('#');
+    let nodekey=keysOfArray[0];
+    let attrKey=keysOfArray[1];
+    let indx=parseInt(keysOfArray[2]);
+    let nodeDetails = this.state.nodeDetails;
+    let node = nodeDetails[nodekey];
+    if(!node.attrDetails){
+        node.attrDetails = [];
+    }
+    if(!node.attrDetails[attrKey]){
+        node.attrDetails[attrKey] = {};
+        node.attrDetails[attrKey].isSelected = true;
+        node.attrDetails[attrKey].filterValue = [];
+        node.attrDetails[attrKey].filterType = [];   
+    }else{
+        let filterTypes=node.attrDetails[attrKey].filterType;
+        filterTypes[indx]=listname;
+        node.attrDetails[attrKey].filterType=filterTypes;
+    }    
+    nodeDetails[nodekey] = node;
+    // update the state with the new array of traverse to nodes
+    this.setState({ nodeDetails: nodeDetails });
+  };
+  filterTags = (key,property,state) =>{
+    let filterTags ='';
+    let filters='';
+    state=true;//always enable, in future if wants to disable remove this line
+    if(APERTURE_SERVICE && this.state.enableRealTime){
+        let nodeDetails = this.state.nodeDetails;
+        let node = nodeDetails[key];
+        filterTags= Object.keys(Object.keys(node.attrDetails[property].filterType)).map((indx) =>{
+                    let selectedFilter=(node.attrDetails[property].filterType[indx]!=='')?node.attrDetails[property].filterType[indx]:this.state.filterTypeDisplay;
+                    return <div style={{margin:'0px 0px 0px 5px'}}>
+                        <label>
+                            <FilterTypes param={this.state}
+                            selectedFilter={selectedFilter}
+                            id={key+'#'+property+'#'+indx}
+                            onMenuSelect={this.onTargetMenuOfFilterTypes}
+                            state={!state}/>
+                        </label>
+                        </div>
+                    });
+        filters= <Col md={4} className='removeLeftPadding'>{filterTags}</Col>;
+    }
+    return filters;
+  };
+  addOrTemplate=(nodeKey,attrKey,indx)=>{
+    let nodeDetails = this.state.nodeDetails;
+    let node = nodeDetails[nodeKey];
+    node.attrDetails[attrKey].filterValue.push('');
+    node.attrDetails[attrKey].filterType.push('EQ');
+    nodeDetails[nodeKey] = node;
+    // update the state with the new array of traverse to nodes
+    this.setState({ nodeDetails: nodeDetails });    
+  };
+  deleteOrTemplate=(nodeKey,attrKey,index)=>{
+    let nodeDetails = this.state.nodeDetails;
+    let node = nodeDetails[nodeKey];
+    let filterValuesArray=node.attrDetails[attrKey].filterValue;
+    let filterTypeArray=node.attrDetails[attrKey].filterType;
+    filterValuesArray.splice(index,1);
+    filterTypeArray.splice(index,1);
+    node.attrDetails[attrKey].filterValue=filterValuesArray;
+    node.attrDetails[attrKey].filterType=filterTypeArray;
+    nodeDetails[nodeKey] = node;
+    this.setState({ nodeDetails: nodeDetails });
+  }
+  render(){   
+    return(
+        <div id='pathFilterDSLModel'>            
+            <div className="addPadding">                
+                <div className={'row ' + (!this.state.init ? 'show' : 'hidden')}>
+                    <div className="checkbox" style={{float:'left',width:'70%'}}>
+                        <label>
+                            <input type="checkbox" checked={this.state.autoZoomEnabled} onChange={this.onAutoZoomCheckbox.bind(this)}/>
+                            Auto Zoom Enabled
+                        </label>
+                    </div>
+                    <div style={{float:'right'}}> 
+                        <Button onClick={this.props.closePathNodeModal}>Close</Button>
+                        <Button onClick={this.submitPathNodeModal} disabled={(this.state.dslQuery === '')}>Submit</Button> 
+                    </div> 
+                </div>
+                <div className={'row ' + (!this.state.init ? 'show' : 'hidden')}>
+                    <div style={{fontWeight:'bold'}}>
+                        <span>DSL PATH Query :</span> {this.state.dslQuery}
+                    </div>                                       
+                </div>
+                <div className={'row ' + ((this.state.dslQuery != '') ? 'hidden' : 'show')}>
+                    <div style={{float:'left'}}>
+                        <button className='btn btn-primary' type='button' onClick={this.initialLoadWhileClose}>Start Building (+)</button>
+                    </div>
+                    <div style={{float:'right'}}> 
+                        <Button onClick={this.props.closePathNodeModal}>Close</Button>
+                        <Button onClick={this.submitPathNodeModal} disabled={(this.state.dslQuery === '')}>Submit</Button> 
+                    </div> 
+                </div>                                
+            </div>
+            <svg id='PathDSLBuilder' width='1800' height='800'></svg>     
+            <div className='static-modal' id='customDslPathBuilderModel'>
+            		<Modal show={this.state.showNodeModal} onHide={this.closeNodeModal}>
+            			<Modal.Header>
+            				<Modal.Title>Modify Dsl Path Query</Modal.Title>
+            			</Modal.Header>
+            			<Modal.Body>
+                          <form>
+                               {Object.keys(this.state.nodeDetails).sort().map((key, node) => (
+                                    <div className="dsl-panel">
+                                       <Panel>
+                                         <Panel.Heading>
+                                           <Panel.Title>
+                                             <div className={'checkbox ' + (!this.state.init ? 'show' : 'hidden')}>
+                                                <label>
+                                                  <input type="checkbox" checked={this.state.nodeDetails[key].isSelected} value={key} onChange={this.onNodeCheckbox.bind(this)} />
+                                                  {this.state.nodeDetails[key].nodeType}
+                                                </label>
+                                                <Panel.Toggle>
+                                                  <div className="pull-right">Options</div>
+                                                </Panel.Toggle>
+                                             </div>
+                                             <div className={'form-check ' + (this.state.init ? 'show' : 'hidden')}>
+                                                <label className="form-check-label">
+                                                  <input className="form-check-input" type="radio" value={key} checked={this.state.nodeDetails[key].isSelected} onChange={this.onNodeRadio.bind(this)} />
+                                                  {" " + this.state.nodeDetails[key].nodeType}
+                                                </label>
+                                                <Panel.Toggle>
+                                                  <div className="pull-right">Options</div>
+                                                </Panel.Toggle>
+                                             </div>
+                                           </Panel.Title>
+                                         </Panel.Heading>
+                                         <Panel.Collapse>
+                                           <Panel.Body className='cardwrap'>                                                                                                                                                                               
+                                             <Grid fluid={true} className='addPaddingTop'>
+                                                <Row className='show-grid addPaddingTop'>
+                                                   <Col md={(this.state.enableRealTime)?4:6}>
+                                                     <strong>PROPERTIES</strong>
+                                                   </Col>
+                                                   {this.state.enableRealTime && <Col md={4} className='removeLeftPadding'>
+                                                     <strong>Filter Types</strong>
+                                                   </Col>}
+                                                   <Col md={(this.state.enableRealTime)?4:6} className='removeLeftPadding'>
+                                                      <strong>Filter By (Optional)</strong>
+                                                   </Col>
+                                                </Row>
+                                             {Object.keys(this.state.nodeDetails[key].attrDetails).sort().map((attrKey, attr) => {
+                                                return(
+                                                       <Row className='show-grid'>
+                                                          <Col md={(this.state.enableRealTime)?4:6}>
+                                                           <div className="checkbox">
+                                                               <label>
+                                                                 {attrKey}
+                                                               </label>
+                                                            </div>
+                                                          </Col>
+                                                          {this.filterTags(key,attrKey,this.state.nodeDetails[key].attrDetails[attrKey].isSelected)}
+                                                          <Col md={(this.state.enableRealTime)?4:6} className='removeLeftPadding'>
+                                                          {Object.keys(this.state.nodeDetails[key].attrDetails[attrKey].filterValue).map((indx) =>{
+                                                            return(
+                                                                <div>
+									                                {this.state.nodeDetails[key].attrDetails[attrKey].filterValue[indx] ==='' && <input type="text" 
+                                                                        placeholder={"Enter " + attrKey }
+                                                                        className='inputFilter'
+                                                                        onBlur={(e)=>{this.onFilterValueChange(e, key, attrKey,indx);}}
+                                                                        />
+                                                                    }
+                                                                    {this.state.nodeDetails[key].attrDetails[attrKey].filterValue[indx] !=='' && <input type="text" 
+                                                                        onChange={(e)=>{this.onFilterValueChange(e, key, attrKey,indx);}} 
+                                                                        placeholder={"Enter " + attrKey }
+                                                                        className='inputFilter'
+                                                                        value={this.state.nodeDetails[key].attrDetails[attrKey].filterValue[indx]}
+                                                                        />
+                                                                    }
+                                                                    {indx == 0 && <button 
+                                                                        className={(this.state.nodeDetails[key].attrDetails[attrKey].filterValue[indx] !=='')?'btn btn-primary':'btn btn-secondary'} 
+                                                                        style={{padding:'2px',margin:'0px 0px 7px 3px'}} 
+                                                                        disabled={this.state.nodeDetails[key].attrDetails[attrKey].filterValue[indx]===''} 
+                                                                        type='button' 
+                                                                        onClick={e => {this.addOrTemplate(key,attrKey,indx)}}>+</button>}
+                                                                    {indx > 0 && <button
+                                                                        style={{padding:'2px',margin:'0px 0px 7px 3px'}}
+                                                                        id={'delete-'+indx}
+                                                                        className='btn btn-danger'
+                                                                        type='button'
+                                                                        onClick={e => {this.deleteOrTemplate(key,attrKey,indx)}}>x</button>}
+
+                                                                </div>
+                                                            )
+                                                          })}
+                                                          </Col>
+                                                       </Row>
+                                                );
+                                              }
+                                             )}
+                                             </Grid>                                                                                         
+                                           </Panel.Body>
+                                         </Panel.Collapse>
+                                       </Panel>
+                                    </div>
+                               ))}
+                             </form>
+            			</Modal.Body>
+            			<Modal.Footer>
+            				<Button onClick={this.closeNodeModal}>Close</Button>
+            				<Button onClick={this.submitNodeModal}>Submit</Button>
+            			</Modal.Footer>
+            		</Modal>
+                </div>
+                <div className='static-modal' id='editNodeModel'>
+                	<Modal show={this.state.showEditNodeModal} onHide={this.closeEditNodeModal}>
+                		<Modal.Header>
+                			<Modal.Title>Modify Node</Modal.Title>
+                		</Modal.Header>
+                		<Modal.Body>
+                          <form>
+                            <div className="dsl-panel">
+                               <Panel>
+                                 <Panel.Heading>
+                                   <Panel.Title>
+                                     <div>
+                                        <label>{this.state.selectedNode
+                                                && this.state.selectedNode.data
+                                                && this.state.selectedNode.data.details ?
+                                                this.state.selectedNode.data.details.nodeType
+                                                : ""
+                                               }
+                                        </label>
+                                     </div>
+                                   </Panel.Title>
+                                 </Panel.Heading>
+                                 <Panel.Body className='cardwrap'>                                  
+                                   <Grid fluid={true} className='addPaddingTop'>
+                                      <Row className='show-grid addPaddingTop'>
+                                         <Col md={(this.state.enableRealTime)?4:6}>
+                                           <strong>Include in Output</strong>
+                                         </Col>
+                                         {this.state.enableRealTime && <Col md={4} className='removeLeftPadding'>
+                                           <strong>Filter Types</strong>
+                                         </Col>}
+                                         <Col md={(this.state.enableRealTime)?4:6} className='removeLeftPadding'>
+                                            <strong>Filter By (Optional)</strong>
+                                         </Col>
+                                      </Row>
+                                   {this.state.selectedNode
+                                        && this.state.selectedNode.data
+                                        && this.state.selectedNode.data.details
+                                        && this.state.nodeDetails[0]
+                                        && Object.keys(this.state.nodeDetails[0].attrDetails).sort().map((attrKey, attr) => {
+                                      return(
+                                             <Row className='show-grid'>
+                                                <Col md={(this.state.enableRealTime)?4:6}>
+                                                 <div className="checkbox">
+                                                     <label>                                                      
+                                                       {attrKey}
+                                                     </label>
+                                                  </div>
+                                                </Col>
+                                                {this.filterTags(0,attrKey, this.state.nodeDetails[0].attrDetails[attrKey].isSelected)}
+                                                <Col md={(this.state.enableRealTime)?4:6} className='removeLeftPadding'>
+                                                {Object.keys(this.state.nodeDetails[0].attrDetails[attrKey].filterValue).map((indx) =>{
+                                                  return(
+                                                      <div>
+                                                          
+                                                          {this.state.nodeDetails[0].attrDetails[attrKey].filterValue[indx] ==='' && <input type="text"
+                                                              placeholder={"Enter " + attrKey }
+                                                              className='inputFilter'
+                                                              onBlur={(e)=>{this.onFilterValueChange(e, 0, attrKey, indx);}}
+                                                              />
+                                                          }
+                                                          {this.state.nodeDetails[0].attrDetails[attrKey].filterValue[indx] !=='' && <input type="text"
+                                                              onChange={(e)=>{this.onFilterValueChange(e, 0, attrKey,indx);}}
+                                                              placeholder={"Enter " + attrKey }
+                                                              className='inputFilter'
+                                                              value={this.state.nodeDetails[0].attrDetails[attrKey].filterValue[indx]}
+                                                              />
+                                                          }
+                                                          {indx == 0 && <button
+                                                              className={(this.state.nodeDetails[0].attrDetails[attrKey].filterValue[indx]!=='')?'btn btn-primary':'btn btn-secondary'}
+                                                              style={{padding:'2px',margin:'0px 0px 7px 3px'}}
+                                                              disabled={this.state.nodeDetails[0].attrDetails[attrKey].filterValue[indx]===''}
+                                                              type='button'
+                                                              onClick={e => {this.addOrTemplate(0 ,attrKey,indx)}}>+</button>}
+                                                          {indx > 0 && <button
+                                                              style={{padding:'2px',margin:'0px 0px 7px 3px'}}
+                                                              id={'delete-'+indx}
+                                                              className='btn btn-danger'
+                                                              type='button'
+                                                              onClick={e => {this.deleteOrTemplate(0 ,attrKey,indx)}}>x</button>}
+
+                                                      </div>
+                                                  )
+                                                })}
+
+                                                </Col>
+                                             </Row>
+                                      );
+                                    }
+                                   )}
+                                   </Grid>
+                                 </Panel.Body>
+                               </Panel>
+                            </div>
+                          </form>                          
+                		</Modal.Body>
+                		<Modal.Footer>
+                			<Button onClick={this.closeEditNodeModal}>Close</Button>
+                			<Button onClick={this.submitEditNodeModal}>Submit</Button>
+                		</Modal.Footer>
+                	</Modal>
+                </div>                  
+        </div>
+	);
+  }
+}
+
+export default PathFilterDslBuilder;
diff --git a/src/app/customQuery/CustomQuery.jsx b/src/app/customQuery/CustomQuery.jsx
new file mode 100644
index 0000000..9ff9248
--- /dev/null
+++ b/src/app/customQuery/CustomQuery.jsx
@@ -0,0 +1,946 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, { Component } from 'react';
+
+import Select from 'react-select';
+import Button from 'react-bootstrap/lib/Button';
+import Row from 'react-bootstrap/lib/Row';
+import Col from 'react-bootstrap/lib/Col';
+import Grid from 'react-bootstrap/lib/Grid';
+import PanelGroup from 'react-bootstrap/lib/PanelGroup';
+import Panel from 'react-bootstrap/lib/Panel';
+import Label from 'react-bootstrap/lib/Label';
+import Collapse from 'react-bootstrap/lib/Collapse';
+import moment from "moment";
+import DatePicker from 'react-datepicker';
+import Modal from 'react-bootstrap/lib/Modal';
+import {ExportExcel} from 'utils/ExportExcel.js';
+import commonApi from 'utils/CommonAPIService.js';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+import Spinner from 'utils/SpinnerContainer.jsx';
+import ModelGallery from 'app/model/modelSearch/components/ModelGallery.jsx';
+import ModelCard from 'app/model/modelSearch/components/ModelCard.jsx';
+import OutputToggle from 'generic-components/OutputToggle.jsx';
+import Pagination from 'react-js-pagination';
+import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger';
+import Tooltip from 'react-bootstrap/lib/Tooltip';
+import {Visualization} from 'generic-components/OutputVisualization.jsx';
+import DownloadRangeModel from 'generic-components/DownloadRangeModel.jsx';
+
+
+
+let PAGINATION_CONSTANT = GlobalExtConstants.PAGINATION_CONSTANT;
+let INVLIST = GlobalExtConstants.INVLIST;
+let CUSTOMQUERYLIST = GlobalExtConstants.CUSTOMQUERYLIST;
+let generateExcels = ExportExcel.generateExcels;
+let DOWNLOAD_ALL = GlobalExtConstants.DOWNLOAD_ALL;
+let DOWNLOAD_TOOLTIP = GlobalExtConstants.DOWNLOAD_TOOLTIP;
+
+
+let dropdownList = null;
+let header = null;
+
+const inputClasses = ['form-control'];
+
+class CustomQuery extends Component {
+  nodeResults = '';
+  typeOfCall = true;
+  downloadTooltip = DOWNLOAD_TOOLTIP;
+  downloadAllTooltip = 'Downloads First ' + DOWNLOAD_ALL + ' Results';
+  downloadRangeTooltip= 'Download Results By Custom Range Selection';
+  historyStackString = '';
+  state = {
+    queryPlaceHolder: 'Please Select a Query',
+    placeholder: 'Please Select a Query',
+    reqPropPlaceholder: 'Please Enter Required Query or Property',
+    optionalPropPlaceholder: 'Please Enter Optional Query or Property',
+    displayReqProps: 'hidden',
+    startNode: '',
+    reqProps: '',
+    optionalProps: '',
+    disableInputs: true,
+    query: '',
+    showText: false,
+    description: '',
+    additionalInfo: '',
+    displayDescription: 'hidden',
+    customQueryOptions: null,
+    formIsValid: false,
+    nodes: [],
+    displayNodes: 'hidden',
+    multipleNodes: '',
+    isLoading: false,
+    isInitialLoad: true,
+    activePage: 1,
+    totalResults: 0,
+    showPagination: false,
+    showResults: false,
+    errorResults:false,
+    errorMessage: '',
+    noResults: false,
+    displayOptionalProps: 'hidden',
+    showHistoryModal:false,
+    startDate: moment(),
+    currentPayload: null,
+    viewName: localStorage.getItem(GlobalExtConstants.ENVIRONMENT + '_' + sessionStorage.getItem(GlobalExtConstants.ENVIRONMENT + 'userId') + '_viewPreference')  || 'CardLayout',
+    res: null,
+    visualAddition: false,
+    nodeDisplay: '',
+    showNodeModal: false,
+    focusedNode: {},
+    historyType: 'cq',
+    focusedNodeUri: 0,
+    focusedNodeType: '',
+    historyParams: '',
+    showModelOptions: false,
+    enableCalendar: true,
+    resetColumnFilters: true,
+    isPageNumberChange: false,
+    totalPages: 0,
+    pageRange: 1,
+    showDownloadResultsModal: false,
+    errorDownloadResults:false,
+    downloadErrorMsg: '',      
+    enableModelBusyFeedback:false,
+    downloadCount:DOWNLOAD_ALL,
+    defaultViewName: localStorage.getItem(GlobalExtConstants.ENVIRONMENT + '_' + sessionStorage.getItem(GlobalExtConstants.ENVIRONMENT + 'userId') + '_viewPreference')  || 'CardLayout'
+  }
+
+  componentWillMount () {
+    console.log('componentWillMount');
+    sessionStorage.setItem(GlobalExtConstants.ENVIRONMENT + 'ENABLE_ANALYSIS', false);
+    if(!this.props.location.historyStackString){
+      this.props.location.historyStackString = this.props.location.pathname + ',,Origin||';
+    }else{
+      this.historyStackString = this.props.location.historyStackString;
+    }
+    let queryList = Object.values(CUSTOMQUERYLIST.CUSTOMQUERYLIST);
+    dropdownList = queryList.sort(function (filter1, filter2) {
+      if (filter1.value < filter2.value) {
+        return -1;
+      } else if (filter1.value > filter2.value) {
+        return 1;
+      } else {
+        return 0;
+      }
+    });
+  };
+  onInputChangeHandler (){
+    console.log('onInputChangeHandler of select-Clear');
+    this.setState({ 
+        placeholder: 'Please Select A Query',
+        queryPlaceHolder: 'Please Select A Query', query: '',
+        reqPropPlaceholder: 'Please Enter Required Query or Property',
+        optionalPropPlaceholder: 'Please Enter Optional Query or Property',
+        startNode: '',
+        reqProps: '', 
+        optionalProps: '',
+        disableInputs: true,
+        displayDescription: 'hidden',
+        nodes: [],
+        displayNodes: 'hidden',
+        multipleNodes: '',
+        isLoading: false,
+        displayOptionalProps: 'hidden',
+        formIsValid: false,
+        showPagination: false,
+        showResults: false,
+        errorResults: false,
+        errorMessage: '',
+        noResults: false,
+        isInitialLoad: true
+      });
+  }
+
+  updateSelectedHandler = (selectedOption) => {
+
+    const value = selectedOption === null ? 'Please Select A Query' : selectedOption.value
+    if(selectedOption){
+      console.log('updateSelectedHandler.reqPropPlaceholder: ' + selectedOption.reqPropPlaceholder);
+      console.log('updateSelectedHandler.value: ' + selectedOption.value);
+      this.setState({ placeholder: selectedOption.placeholder });
+      this.setState({ displayReqProps: selectedOption.reqPropPlaceholder ? 'show' : 'hidden' });
+      this.setState({ displayOptionalProps: selectedOption.optionalPropPlaceholder ? 'show' : 'hidden'});
+      this.setState({ reqPropPlaceholder: selectedOption.reqPropPlaceholder });
+      this.setState({ optionalPropPlaceholder: selectedOption.optionalPropPlaceholder});
+      this.setState({ disableInputs: false });
+      this.setState({ query: value });
+      this.setState({ description: selectedOption.description.summary });
+      this.setState({ additionalInfo: selectedOption.description.additionalInfo });
+      this.setState({ displayDescription: 'show' });
+      this.setState({ startNode: ''});
+      this.setState({ reqProps: ''});
+      this.setState({ optionalProps: ''});
+      this.setState({ queryPlaceHolder: value});
+    }else{
+       /*this.setState({ queryPlaceHolder: value, query: '',
+          reqPropPlaceholder: this.state.reqPropPlaceholder,optionalPropPlaceholder: this.state.optionalPropPlaceholder,
+          startNode: '',reqProps: '', optionalProps: ''});*/
+          this.onInputChangeHandler();
+    }    
+  }
+  checkValidity() {
+    let isValid = true;
+    isValid = this.state.startNode.trim().length > 1 && isValid;
+    if (this.state.reqPropPlaceholder) {
+      console.log('Checking if reqProps is on state...');
+      isValid = this.state.reqProps.length > 1 && isValid;
+    }
+    return isValid;
+  }
+
+  inputChangeHandler = (event) => {
+    const target = event.target;
+    const value = target.value;
+    const name = target.name;
+    console.log('inputChangeHandler.value: ' + value);
+    console.log('inputChangeHandler.name: ' + name);
+    let formIsValid = null;
+    this.setState(
+      { [name]: value },
+      function () {
+        console.log('startNode:' + this.state.startNode);
+        console.log('reqProps:' + this.state.reqProps);
+        formIsValid = this.checkValidity();
+        console.log('formIsValid:' + formIsValid);
+        this.setState({ formIsValid: formIsValid });
+      });
+  }
+
+  onAdditem = (event) => {
+    //window.alert('onAddItem clicked');
+    event.preventDefault();
+    this.nodeResults = '';
+    this.typeOfCall = true;
+    this.formQueryString();
+  };
+  formPayload = () => {
+    var startNode = this.state.startNode;
+    startNode.trim();
+    console.log('startNode.trim().length: ' + startNode.trim().length);
+    var queryName = this.state.query;
+    var reqProps = this.state.reqProps;
+    var optionalProps = this.state.optionalProps;
+    console.log('start Node: ' + startNode);
+    console.log('query name: ' + queryName);
+    console.log('req props: ' + reqProps);
+    console.log('Optional props: ' + optionalProps);
+    let payload = null;
+
+    if(queryName === 'node-fromURI'){
+        payload = {
+            start: startNode
+        };
+    } else if ( reqProps === '' && optionalProps === '' ){
+      payload = {
+        start: startNode,
+        query: 'query/' + queryName
+      };
+    } else if(reqProps !== ''){
+      reqProps = '?' + reqProps;
+      payload = {
+        start: startNode,
+        query: 'query/' + queryName + reqProps
+      };
+    }
+    if(optionalProps !== ''){
+      if(reqProps === ''){
+        optionalProps = '?' + optionalProps;
+      }else{
+        optionalProps = reqProps + optionalProps;
+      }
+      payload = {
+        start: startNode,
+        query: 'query/' + queryName + optionalProps
+      };
+    }
+    return payload
+  }
+  formQueryString = () =>{
+    let payload = this.formPayload();
+
+    console.log('payload>>>>>' + payload.toString());
+    const settings = {
+      'NODESERVER': INVLIST.NODESERVER,
+      'PROXY': INVLIST.PROXY,
+      'PREFIX': INVLIST.PREFIX,
+      'VERSION': INVLIST.VERSION,
+      'USESTUBS': INVLIST.useStubs
+
+    };
+    let queryStr = '';
+    if(this.typeOfCall){
+      queryStr = 'query?format=simple&resultIndex='
+                   + this.state.activePage + '&resultSize=' + PAGINATION_CONSTANT.RESULTS_PER_PAGE;
+      this.setState({isLoading: true,nodes: [], currentPayload:payload});
+    }else{
+      let pagerange=this.state.pageRange.toString();
+      pagerange=pagerange.split('-');
+      if(pagerange.length > 1){
+        queryStr = 'query?format=simple&resultIndex=' + parseInt(pagerange[0]) + '&resultSize=' + PAGINATION_CONSTANT.RESULTS_PER_PAGE + '&resultRangeEnd=' + parseInt(pagerange[1]);
+      }else{
+        queryStr = 'query?format=simple&resultIndex=1&resultSize=' + parseInt(pagerange);
+      }
+      this.setState({enableModelBusyFeedback: true, currentPayload:payload});
+    }
+        this.getNodes(settings, queryStr, 'PUT', payload);
+  }
+
+
+  getNodes(settings, path, httpMethodType, payload) {
+    commonApi(settings, path, httpMethodType, payload, 'CQDefault')
+      .then(res => {
+        console.log(Object.keys(res.data));
+        this.processData(res);
+        if(this.state.nodes.length > 0 && this.state.visualAddition){
+            Visualization.chart('currentState' , [], [], this.state.res.data, this);
+        }
+        console.log('res:' + res);
+      }, error => {
+          console.log(JSON.stringify(error));
+          if(this.typeOfCall){
+            this.triggerError(error);
+          }else{
+            let errMsg = this.renderErrorMsg(error);
+            this.setState({ isLoading: false,errorDownloadResults:true,downloadErrorMsg:errMsg,enableModelBusyFeedback:false});       
+             }          
+      }).catch(error =>
+      {
+        console.log(JSON.stringify(error));        
+        if(this.typeOfCall){
+					this.triggerError(error);
+				}else{
+					let errMsg = this.renderErrorMsg(error);
+					this.setState({ isLoading: false,errorDownloadResults:true,downloadErrorMsg:errMsg,enableModelBusyFeedback:false});       
+     		}
+      });
+
+    this.isEnabled = [];
+  }
+
+  triggerError = (error) =>{
+    // this.processData('');
+     this.setState({isLoading: false,
+       totalResults: 0,
+       showPagination: false,
+       showResults: false,
+       isInitialLoad: false,
+       errorResults:true,
+       noResults: true
+     });
+     this.downloadAllTooltip = 'Downloads First ' + DOWNLOAD_ALL + ' Results';
+     let errMsg = this.renderErrorMsg(error);
+     this.setState({errorMessage:errMsg});     
+  }
+  renderErrorMsg = (error) =>{
+     let errMsg='';
+     if (error.response) {
+       // The request was made and the server responded with a status code
+       // that falls out of the range of 2xx
+       console.log(error.response.data);
+       console.log(error.response.status);
+       console.log(error.response.headers);
+       if(error.response.status){
+           errMsg += " Code: " + error.response.status;
+       }
+  	   if(error.response.data){
+           errMsg += " - " + JSON.stringify(error.response.data);
+       }
+     } else if (error.request) {
+       // The request was made but no response was received
+       // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
+       // http.ClientRequest in node.js
+       console.log(error.request);
+       errMsg += " - Request was made but no response received";
+     } else {
+       // Something happened in setting up the request that triggered an Error
+       console.log('Error', error.message);
+       errMsg += " - Unknown error occurred " + error.message;
+     }     
+     console.log(error.config);
+     return errMsg;
+  }
+
+  processData(resp) {
+    //data = CustomQueryResponse;
+    console.log( 'in Custom Query component file DATA: ' + JSON.stringify(resp.data));
+    if(this.typeOfCall){
+      if(resp.data && resp.data.results) {
+        this.setState(
+          { res: resp,
+            nodes: resp.data.results},
+          function () {
+            console.log('how many nodes? ', this.state.nodes.length);
+            this.setState({ multipleNodes: this.state.nodes.length > 1 ? 'col-lg-3 col-xl-3' : '' });
+          });
+      }
+      let totalResults = 0;
+      let downloadCount = DOWNLOAD_ALL;  
+      if(resp.headers){
+          totalResults = parseInt(resp.headers['total-results']);
+          if(totalResults > DOWNLOAD_ALL){
+            this.downloadAllTooltip = DOWNLOAD_ALL + ' results out of '+ totalResults +' Results will be downloaded, please filter results further to obtain full report';
+          }else{          
+            this.downloadAllTooltip = (totalResults === 1) ?'Downloads ' + totalResults + ' Results' : 'Downloads all ' + totalResults + ' Results' ;
+            downloadCount= totalResults;
+          } 
+          this.setState({isLoading: false,
+            totalResults: totalResults,
+            totalPages: parseInt(resp.headers['total-pages']),
+            showResults: resp.headers['total-results'] > 0 ? true : false,
+            showPagination: resp.headers['total-results'] > 0 ? true : false,
+            isInitialLoad: false,
+            noResults: resp.headers['total-results'] && resp.headers['total-results'] > 0 ? false : true,
+            errorResults: !resp.headers['total-results'],
+            downloadCount: downloadCount
+          });        
+        }
+
+        this.setState({ displayNodes: 'show', viewName: this.state.defaultViewName });
+    }else{
+      if(resp.data && resp.data.results) {
+        this.nodeResults = resp.data.results;
+        let totalResults = 0;
+        let totalPages = 0;
+        if(resp.headers){
+            totalResults = parseInt(resp.headers['total-results']);
+            totalPages = parseInt(resp.headers['total-pages']);
+        }                
+        this.setState({isLoading: false,totalPages:totalPages,errorDownloadResults:false,downloadErrorMsg:''},() => {this.getAllExcels()});
+      }else{
+        this.nodeResults = '';
+        this.setState({isLoading: false,errorDownloadResults:true,downloadErrorMsg:error+'',enableModelBusyFeedback:false});
+      }
+    }
+  }
+
+  nodeOnClick(event, uri, id, nodeType) {
+    event.preventDefault();
+    let delimiter = '\/';
+    let start = 3;
+    let tokens = uri.split(delimiter).slice(start);
+    let result = tokens.join(delimiter);
+    sessionStorage.setItem(GlobalExtConstants.ENVIRONMENT + 'URI', result);
+    console.log(['/model/' + nodeType + '/' + id + '/' + '1']);
+  };
+  openDownloadRange = () =>{    
+    this.setState({
+      showDownloadResultsModal: true,
+      errorDownloadResults: false,
+      downloadErrorMsg:''});    
+  }
+  closeDownloadResults = () =>{
+    this.setState({
+      showDownloadResultsModal: false,
+      enableModelBusyFeedback: false
+    });   
+  }
+  getAllExcels = (pageRange,rangeState) =>{   
+    
+    console.log('getAllExcels>>>>>>>>>>>*',pageRange);
+    if(pageRange){
+      this.typeOfCall=false;
+      let rangeModelState=(rangeState)? rangeState: false;
+      this.setState(
+        { pageRange: pageRange,enableModelBusyFeedback:true,showDownloadResultsModal:rangeModelState},
+        function () { this.formQueryString(); }.bind(this)
+      );
+    }else{
+      this.setState(
+        {errorDownloadResults: false, showDownloadResultsModal: false, downloadErrorMsg:'', isLoading: false, enableModelBusyFeedback:false},
+        function () { generateExcels(this.nodeResults);this.nodeResults='';this.typeOfCall = true;}.bind(this)
+      );      
+    }   
+  }
+  getExcels = () =>{
+    this.typeOfCall = true;
+    generateExcels(this.state.nodes);
+  }
+
+    handlePageChange = (pageNumber) => {
+    console.log('[CustomQuery.jsx] HandelPageChange active page is', pageNumber);
+    this.typeOfCall = true;
+    this.setState(
+      { activePage: pageNumber, isLoading: true, nodes: [], resetColumnFilters: false, isPageNumberChange: true },
+      function () { this.formQueryString(); }.bind(this)
+    );
+  };
+  openHistory = (nodeDisplay, nodeUri, nodeType) => { // open modal from Card
+    console.log('history >> showModal',nodeDisplay);
+    
+    if(nodeType){
+      this.setState({
+        nodeDisplay: nodeDisplay,
+        showHistoryModal: true,
+        showModelOptions:true,
+        enableCalendar:true,
+        historyType:(this.state.historyType === 'cq') ? 'nodeState' : this.state.historyType,
+        focusedNodeUri: nodeUri,
+        focusedNodeType: nodeType,
+      });
+    }else{
+      let payload = this.formPayload();
+    this.setState({
+        showHistoryModal:true,
+        showModelOptions:false,
+        focusedNodeUri: JSON.stringify(payload),
+        focusedNodeType: nodeType,
+        enableCalendar:true,
+		historyType :'cq'
+    });
+  }
+    }
+  closeHistory = () => {
+  	this.setState({
+  		showHistoryModal: false,
+		enableCalendar:true,
+		historyType :'nodeState'
+  	});
+  }
+
+  setViewName(event) {
+    console.log(event.currentTarget.value);
+    this.setState({
+    		viewName: event.currentTarget.value
+    });
+  }
+
+  setDefaultViewName(event) {
+    let ENVIRONMENT = GlobalExtConstants.ENVIRONMENT;
+    let layout =  event.target.value;
+
+    if(sessionStorage.getItem(ENVIRONMENT + 'userId')) {
+      if (event.target.checked) {
+        localStorage.setItem(ENVIRONMENT + '_' + sessionStorage.getItem(ENVIRONMENT + 'userId') + '_viewPreference', layout);
+      } else {
+        localStorage.removeItem(ENVIRONMENT + '_' + sessionStorage.getItem(ENVIRONMENT + 'userId') + '_viewPreference');
+      }
+    }
+
+    this.setState({
+      defaultViewName: event.target.value
+    });
+  }
+
+  submitHistory = () => {
+    console.log("submitting history");
+    let paramToPassThrough = '';
+    if(this.state.focusedNodeType){
+      paramToPassThrough = '/history/' + this.state.historyType +'/' + this.state.focusedNodeType + '/' + btoa(this.state.focusedNodeUri);
+    }else{
+      paramToPassThrough = '/historyQuery/' + this.state.historyType + '/' + btoa(this.state.focusedNodeUri);     
+    }
+    let epochStartTime = (this.state.startDate).unix();
+    this.props.history.push(paramToPassThrough + '/' + epochStartTime * 1000);
+  }
+
+  handleDateChange = (newDate) =>{
+    this.setState({ startDate: moment(+newDate) });
+    console.log('[CustomQuery.jsx] handleDateChange date is ', this.state.startDate);
+    console.log('[CustomQuery.jsx] handleDateChange date is in millis ', +this.state.startDate);
+  }
+  setHistoryType(event) {
+    console.log(event.target.value);
+    let enableCalendar = false;
+    if(event.target.value === 'nodeLifeCycle'){
+        enableCalendar = false;
+    }else{
+        enableCalendar = true;
+    }
+    this.setState({
+    		historyType: event.target.value,
+    		enableCalendar: enableCalendar
+    });
+    console.log(this.state.enableCalendar);
+  }
+  openNodeModal(nodeDisplay, nodeUri, nodeType){ // open modal
+                 console.log('customquery >> showModal');
+                 nodeDisplay = "Node Details of " + nodeUri;
+                 let node = null;
+                 let found = false;
+                 for(var j = 0; j < this.state.nodes.length && !found; j++){
+                    if(this.state.nodes[j].url === nodeUri){
+                        node = this.state.nodes[j];
+                        found = true;
+                    }
+                 }
+                 if(nodeDisplay && found){
+                    this.setState({
+                       nodeDisplay: nodeDisplay,
+                       focusedNode: node,
+                       showNodeModal:true
+                    });
+                 }else{
+                     this.setState({
+                     showNodeModal:true
+                     });
+                 }
+  }
+
+  closeNodeModal = () => {
+    this.setState({
+    	showNodeModal: false
+    });
+  }
+  componentDidUpdate(prevProps, prevState, snapshot) {
+    if(this.state.nodes.length > 0 && !this.state.visualAddition){
+        Visualization.chart('currentState', [], [], this.state.res.data, this);
+        this.setState({
+                    showPagination: this.state.nodes.length > 0 ? true : false,
+            		visualAddition: true
+        });
+    }
+  }
+  prepareDownloadRangeModel = () =>{
+    let downloadRangeModel = (this.state.showDownloadResultsModal)?<DownloadRangeModel 
+              showDownloadResultsModal={this.state.showDownloadResultsModal}
+              totalPages={this.state.totalPages}
+              totalResults={this.state.totalResults}
+              triggerDownload={this.getAllExcels}
+              errorDownloadResults={this.state.errorDownloadResults}
+              downloadErrorMsg={this.state.downloadErrorMsg}
+              triggerClose={this.closeDownloadResults}
+              enableModelBusyFeedback={this.state.enableModelBusyFeedback}
+          /> : '';
+    return downloadRangeModel;
+  }
+  render() {
+    let simple = 'Enter Start Node Location => network/generic-vnfs/generic-vnf/a642ad94-9a84-4418-9358-c1ee860315e2';
+    let advanced = 'Enter Start Node Location => /cloud-infrastructure/cloud-regions/cloud-region/cloudowner1/cloudregion1';
+    let downloadRangeModel = this.prepareDownloadRangeModel();
+    if (this.state.displayValidationError) {
+      inputClasses.push('invalid');
+    }
+    let styling = inputClasses.join(' ');
+    console.log('styling:' + styling);
+    let nodes = '';
+    let classes = `${this.state.displayNodes} container-fluid`;
+    const modelGalleryElement = <ModelGallery
+                nodes={this.state.nodes} 
+                viewName={this.state.viewName}
+                historyStackString={this.props.location.historyStackString} 
+                openHistoryModal={this.openHistory}
+                isPageNumberChange={this.state.isPageNumberChange}
+                resetColumnInd={this.state.resetColumnFilters}
+                enableRealTime={false}/>;
+    if (this.state.nodes.length > 0) {
+      console.log('nodes exist');
+      nodes =
+        <div>
+          <hr />          
+          {modelGalleryElement}
+        </div >;
+    }
+
+    return (
+      <div>
+        <header className='addPadding jumbotron my-4'>
+          <h1 className='display-2'>Welcome to Custom Queries!</h1>
+          <p className='lead'>
+            On this page you can choose from the many different
+            predefined custom queries has to offer. Simply
+            choose the query name and provide the location of the
+            start node.<br />
+            If prompted please also enter the values in required
+            properties field as some queries require these values
+            to execute.<br />
+            Check the Help Section on the right for examples.
+          </p>
+        </header>
+        <div className='static-modal'>
+           <Modal show={this.state.showHistoryModal} onHide={this.closeHistory}>
+           	<Modal.Header>
+           		<Modal.Title>Retrieve {(this.state.focusedNodeType) ? this.state.focusedNodeType: 'Custom Query '} History</Modal.Title>
+           	</Modal.Header>
+           	<Modal.Body>
+             		<form className={this.state.showModelOptions ? 'show' : 'hidden'}>
+					<div className="radio">
+						<label>
+						<input type="radio" value="nodeState"
+										checked={this.state.historyType === 'nodeState'}
+										onChange={(e) => this.setHistoryType(e)} />
+						View state at
+						</label>
+					</div>
+					<div className="radio">
+						<label>
+						<input type="radio"  value="nodeLifeCycleSince"
+										checked={this.state.historyType === 'nodeLifeCycleSince'}
+										onChange={(e) => this.setHistoryType(e)} />
+						View updates since
+						</label>
+					</div>
+					<div className="radio">
+						<label>
+						<input type="radio" value="nodeLifeCycle"
+										checked={this.state.historyType === 'nodeLifeCycle'}
+										onChange={(e) => this.setHistoryType(e)} />
+						View all updates
+						</label>
+					</div>
+			</form>
+			<div className={this.state.enableCalendar ? 'show' : 'hidden'}>
+           		    <DatePicker
+           		        inline
+                           selected={this.state.startDate}
+                           onChange={(newDate) => this.handleDateChange(newDate)}
+                           showTimeSelect
+                           timeFormat="HH:mm"
+                           timeIntervals={15}
+                           dateFormat="MMMM D, YYYY h:mm a"
+                           timeCaption="time"
+                       />
+                   </div>
+           	</Modal.Body>
+           	<Modal.Footer>
+           		<Button onClick={this.closeHistory}>Close</Button>
+           		<Button onClick={this.submitHistory}>Submit</Button>
+           	</Modal.Footer>
+           </Modal>
+        </div>
+        <div className='static-modal'>
+                         		<Modal show={this.state.showNodeModal} onHide={this.closeNodeModal} dialogClassName="modal-override">
+                         			<Modal.Header>
+                         				<Modal.Title>Retrieve {this.state.nodeDisplay}</Modal.Title>
+                         			</Modal.Header>
+                         			<Modal.Body>
+                                       <Grid fluid={true}>
+                                             <Row className='show-grid'>
+                                               <Col lg={12} md={12} sm={12} xs={12}>
+                                                   <ModelCard
+                                                               key={this.state.focusedNode.id}
+                                                               nodeId={this.state.focusedNode.id}
+                                                               nodeType={this.state.focusedNode['node-type']}
+                                                               nodeProps={this.state.focusedNode.properties}
+                                                               nodeRelatives={this.state.focusedNode['related-to']}
+                                                               nodeUrl={this.state.focusedNode.url}
+                                                               historyStackString={this.props.location.historyStackString}
+                                                               openHistoryModal={this.openHistory}
+                                                               enableRealTime={false}/>
+                                               </Col>
+                                             </Row>
+                                       </Grid>
+                         			</Modal.Body>
+                         			<Modal.Footer>
+                         				<Button onClick={this.closeNodeModal}>Close</Button>
+                         			</Modal.Footer>
+                         		</Modal>
+               </div>
+        <div className='addPadding'>
+          <div className='row addPaddingTop'>
+            <Col md={8}>
+              <form style={{ margin: 0 }} onSubmit={this.onAdditem} id='customQueryForm' name='customQueryForm'>
+                <div className='form-group'>
+                  <label>Query:</label><br />
+                  <div id='customQueryText'>
+                    <Select
+                      className='dropdown-item'
+                      autosize={true}
+                      placeholder={this.state.queryPlaceHolder}
+                      value={this.state.query}
+                      onChange={this.updateSelectedHandler}
+                      options={dropdownList} />
+                  </div>
+                </div>
+                <div className={this.state.displayDescription} id='customQueryDescription'>
+                  <Label bsStyle='info'>Description</Label>
+                  <p><br />{this.state.description}</p>
+                  <a onClick={() => this.setState({ showText: !this.state.showText })}
+                      className={this.state.additionalInfo==='' ? 'hidden' : 'show'}>See more</a><br />
+                  <Collapse in={this.state.showText}>
+                    <div>
+                      <span>
+                        {this.state.additionalInfo.split('\n').map(info => {
+                          return <div>{info}</div>;
+                        })}
+                      </span>
+                    </div>
+                  </Collapse>
+                </div>
+                <div className='form-group addPaddingTop' id='startNodeText'>
+                  <label htmlFor='StartNode'>Enter Start Node Location (full uri path): </label>
+                  <input type='text'
+                    id='startNode'
+                    className={styling}
+                    name='startNode'
+                    placeholder={this.state.placeholder}
+                    onChange={this.inputChangeHandler}
+                    disabled={this.state.disableInputs}
+                    value={this.state.startNode} />
+                </div>
+                <div className={this.state.displayReqProps} id='reqPropsText'>
+                  <label htmlFor={'reqProps'}>Required Properties</label>
+                  <input type='text'
+                    id='reqProps'
+                    className={styling}
+                    name='reqProps'
+                    placeholder={this.state.reqPropPlaceholder}
+                    onChange={this.inputChangeHandler}
+                    disabled={this.state.disableInputs} 
+                    value={this.state.reqProps}/>
+                </div>
+                <div className={this.state.displayOptionalProps}>
+                  <label htmlFor={'optionalProps'}>Optional Properties</label>
+                  <input type='text'
+                         id='optionalProps'
+                         className={styling}
+                         name='optionalProps'
+                         placeholder={this.state.optionalPropPlaceholder}
+                         onChange={this.inputChangeHandler}
+                         disabled={this.state.disableInputs}
+                         value={this.state.optionalProps} />
+                </div>
+                <div className='row addPaddingTop'>
+                  <Col sm={12}>
+                    <button className='btn btn-primary btn-md' disabled={!this.state.formIsValid}>Submit</button>
+                    { INVLIST.isHistoryEnabled && (<button className='btn btn-outline-secondary' type='button' onClick={this.openHistory} disabled={!this.state.formIsValid}>History</button>)}
+                  </Col>
+                </div>
+              </form>
+            </Col>
+            <Col md={4}>
+              <PanelGroup accordion id='rb-accordion'>
+                <Panel eventKey='1'>
+                  <Panel.Heading>
+                    <Panel.Title toggle>+ Simple Query</Panel.Title>
+                  </Panel.Heading>
+                  <Panel.Body collapsible className='cardwrap'>
+                    <p>
+                      Please specify a Query from the Dropdown Menu.<br />
+                      <br />
+                      Please enter exact location of the Starting Node Path
+                      <br /> <br />
+                      Submit
+                      <br /> <br />
+                      Examples: <br />
+                      Query => complex-fromVnf<br />
+                      Enter Starting Node => /network/pnfs/pnf/pnf-name1<br /> <br />
+                      {simple}<br /><br />
+                      *Simple Query requires no other values to be passed other than the start node path
+                    </p>
+                  </Panel.Body>
+                </Panel>
+                <Panel eventKey='2'>
+                  <Panel.Heading>
+                    <Panel.Title toggle>+ Advanced Queries with Properties</Panel.Title>
+                  </Panel.Heading>
+                  <Panel.Body collapsible>
+                    <p className='cardwrap'>
+                      Please specify a Query from the Dropdown Menu.<br />
+                      <br />
+                      Please enter exact location of the Starting Node Path<br /> <br />
+                      Please enter required query parameter - if applicable<br /> <br />
+                      Please enter optional query parameter - if applicable<br /> <br />
+                      Example: <br />
+                      Query => vlantag-fromVlanidouter<br /> <br />
+                      {advanced}<br /> <br />
+                      Required Properties: vlanIdOuter=203<br /> <br />
+                      Optional Properties: vlanIdInner=103
+                    </p>
+                  </Panel.Body>
+                </Panel>
+              </PanelGroup>
+            </Col>
+          </div>
+        </div>
+
+        <div className='addPaddingTop'>
+          <div className='container-fluid model-container custom-query-result'>
+          <Spinner loading={this.state.isLoading}>
+            <Row className={this.state.isInitialLoad ? 'hidden' : 'show'}>
+              <Col md={12}>
+                <h2>
+                  <span className='badge badge-dark'>{this.state.query}</span> Results
+                </h2>
+                <br/>
+                <h5>Total Results: <strong>{this.state.totalResults}</strong></h5>
+              </Col>
+            </Row>
+            { this.state.showResults && <div className='addPaddingTop'>
+                <OutputToggle scope={this} visualDisabled={this.state.totalResults > PAGINATION_CONSTANT}/>
+            </div> }
+            <Row className={this.state.showResults ? 'show' : 'hidden'}>
+		      <Col md={8}  className={this.state.showPagination ? 'show' : 'hidden'}>
+                <Pagination
+                  activePage={this.state.activePage}
+                  itemsCountPerPage={PAGINATION_CONSTANT.RESULTS_PER_PAGE}
+                  totalItemsCount={this.state.totalResults}
+                  pageRangeDisplayed={PAGINATION_CONSTANT.PAGE_RANGE_DISPLAY}
+                  onChange={this.handlePageChange} />
+              </Col>
+              <Col md={2} className='text-right'>
+                <OverlayTrigger  placement='top' overlay={<Tooltip id='tooltip-top'>{this.downloadAllTooltip}</Tooltip>}>
+                  <span className="d-inline-block" style={{display: 'inline-block'}}>
+                    <Button bsSize='small' onClick={()=>{this.getAllExcels(this.state.downloadCount)}}>
+                      Download XLSX <i className='icon-documents-downloadablefile'></i>
+                </Button>
+                  </span>
+                </OverlayTrigger>
+              </Col>
+              <Col md={2} className='text-right'>
+                <OverlayTrigger  placement='top' overlay={<Tooltip id='tooltip-top'>{this.downloadRangeTooltip}</Tooltip>}>
+                  <span className="d-inline-block" style={{display: 'inline-block'}}>
+                    <Button bsSize='small' onClick={this.openDownloadRange}>
+                      Download XLSX (Range) <i className='icon-documents-downloadablefile'></i>
+                    </Button>
+                  </span>
+               </OverlayTrigger>
+              </Col>
+	          </Row>
+              <div className={'addPaddingTop alert alert-danger ' +(this.state.errorResults ? 'show' : 'hidden')} role="alert">
+                An error occurred, please try again later. If this issue persists, please contact the system administrator. {this.state.errorMessage}
+              </div>
+           	  <Row className={'addPaddingTop ' + (this.state.noResults ? 'show' : 'hidden')}>
+           	  	<Col md={12}>
+           	  		<h2>No Results Found</h2>
+           	  	</Col>
+           	  </Row>
+	          <Row className={this.state.isInitialLoad ? 'hidden' : 'show'}>              
+              <div className={this.state.isLoading ? 'hidden' : 'show'}>
+                <div className='col align-self-center'>
+                  <div className={classes}>
+                    {nodes}
+                  </div>
+                </div>
+              </div>
+	          </Row>
+	          <Row className={this.state.showPagination ? 'show' : 'hidden'}>
+		          <Col md={12}>
+                <Pagination
+                  activePage={this.state.activePage}
+                  itemsCountPerPage={PAGINATION_CONSTANT.RESULTS_PER_PAGE}
+                  totalItemsCount={this.state.totalResults}
+                  pageRangeDisplayed={PAGINATION_CONSTANT.PAGE_RANGE_DISPLAY}
+                  onChange={this.handlePageChange} />
+              </Col>
+            </Row>
+            </Spinner>
+            <Spinner loading={this.state.enableModelBusyFeedback}>
+              {downloadRangeModel}
+            </Spinner>
+          </div>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default CustomQuery;
diff --git a/src/app/customQuery/CustomQueryData.js b/src/app/customQuery/CustomQueryData.js
new file mode 100644
index 0000000..3267c1a
--- /dev/null
+++ b/src/app/customQuery/CustomQueryData.js
@@ -0,0 +1,182 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+export const dropDownList = [
+  {
+    placeholder: 'Vnf Required as Start Node',
+    label:'complex-fromVnf',
+    value:'complex-fromVnf',
+    description: {
+      summary: 'The "complex-fromVnf" query allows a client to provide A&AI a vnf name or ID to retrieve the ' +
+      'generic-vnf, pserver, complex, licenses, and entitlements.',
+      additionalInfo:
+      'Input: vnf name or vnf ID\n' +
+      'Output: generic-vnf, pserver, complex, licenses, entitlements\n' +
+      'Users: SDN-GC, Conductor\n' +
+      'Releases: 1707'
+    }
+  },
+  {
+    placeholder: 'Vnf Required as Start Node',
+    label:'topology-summary',
+    value:'topology-summary',
+    description: {
+      summary: 'The "topology-summary" query allows a client to provide A&AI one or more VNFs and retrieve various data ' +
+      'related to that VNF. This includes data about the VNF itself (the generic-vnf), the related vnfc, the related ' +
+      'vserver (along with the tenant, cloud-region, image and flavor) and the related pserver (along with the complex).',
+      additionalInfo:
+      'Input: generic-vnf, The original intent was to pass all generic-vnfs with a specified service-id. ' +
+      '(adding owning-entity, project, platform and line-of-business in 1810 as first step to depreciating service-id)\n' +
+      'Output: the generic-vnf, related platform, line-of-business (1810), related owning-entity, project (from related ' +
+      'service-instance) (1810), related vnfc, related vserver, tenant, cloud-region, image, flavor, related pserver, ' +
+      'complex\n' +
+      'Users: AOTS, GEOLINK, DCAE-Sandbox, POLO\n' +
+      'Releases: 1702, 1810'
+    }
+  },
+  {
+    placeholder: 'Pserver Required as Start Node',
+    label:'service-fromPserverandSubsName',
+    value:'service-fromPserverandSubsName',
+    reqPropPlaceholder:'subscriberName=Enter some value here',
+    description: {
+      summary: 'The "service-fromPServerandSubsName" query allows a client to provide A&AI a hostname and subscriber ' +
+      'name, then return service instance and service subscription information.',
+      additionalInfo:
+      'Input: hostname and subscriber-name\n' +
+      'Output: service-instance and service-subscription\n' +
+      'Users: MSO\n' +
+      'Releases: 1710'
+    }
+  },
+  {
+    placeholder: 'Vnf Required as Start Node',
+    label:'cloudRegion-fromNfType',
+    value:'cloudRegion-fromNfType',
+    description: {
+      summary: 'The "cloudRegion-fromNfType" query allows a client to provide A&AI with an nf-type and returns the ' +
+      'cloud-regions running those vnfs.',
+      additionalInfo:
+      'Input: nf-type\n' +
+      'Output: cloud-region\n' +
+      'Users: vIPR\n' +
+      'Releases: 1710'
+    }
+  },
+  {
+    placeholder: 'Need Pserver as Start Node',
+    label:'colocated-devices',
+    value:'colocated-devices',
+    description: {
+      summary: 'The "colocated-devices" query allows a client to provide A&AI a physical server and retrieves all other ' +
+      'physical devices in the same location along with details on their physical interfaces and links.',
+      additionalInfo:
+      'Input: pserver\n' +
+      'Output: pservers, pnfs, p-interfaces, physical-links\n' +
+      'Users: SDN-GCP\n' +
+      'Releases: 1707'
+    }
+  },
+  {
+    placeholder: 'Need Cloud Region as Start Node',
+    label: 'locationNetTypeNetRole-fromCloudRegion',
+    value: 'locationNetTypeNetRole-fromCloudRegion',
+    description: {
+      summary: 'The "locationNetTypeNetRole-fromCloudRegion" query allows a client to provide A&AI with a ' +
+      'cloud-region-id and returns the cloud-region, complex, and l3-networks.',
+      additionalInfo:
+      'Input: cloud-region-id\n' +
+      'Output: cloud-region, complex, l3-network\n' +
+      'Users: vIPR\n' +
+      'Releases: 1710'
+    }
+  },
+  {
+    placeholder: 'Need Cloud Region as Start Node',
+    label:'sites-byCloudRegionId',
+    value:'sites-byCloudRegionId',
+    description: {
+      summary: 'The "sites-byCloudRegionId " query allows a client to provide A&AI with a cloud-region-id and an ' +
+      'optional cloud-region-version and returns the appropriate complexes.',
+      additionalInfo:
+      'Input: cloud-region-id, optional cloud-region-version\n' +
+      'Output: complex object(s)\n' +
+      'Users: POLICY\n' +
+      'Releases: 1707'
+    }
+  },
+  {
+    placeholder: 'Need Cloud Region as Start Node',
+    label:'cloudRegion-fromCountry',
+    value:'cloudRegion-fromCountry',
+    description: {
+      summary: 'The "cloudRegion-fromCountry" query allows a client to provide A&AI with a country and retrieve all ' +
+      'appropriate cloud-regions.',
+      additionalInfo:
+      'Input: country\n' +
+      'Output: cloud-region\n' +
+      'Users: vIPR\n' +
+      'Releases: 1710'
+    }
+  },
+  {
+    placeholder: 'Need vf-module as Start Node',
+    label:'so-request-vfModule',
+    value:'so-request-vfModule',
+    description: {
+      summary: 'The "so-request-vfModule" query allows a client to provide A&AI a vf-module then return all the ' +
+      'reference objects needed to send MSO an orchestration request.',
+      additionalInfo:
+      'Input: vf-module\n' +
+      'Output: vf-module, generic-vnf, service-instance, volume-group, cloud-region\n' +
+      'Users: VID\n' +
+      'Releases: E1802'
+    }
+  },
+  {
+    placeholder: 'Need Vnf as Start Node',
+    label:'linked-devices',
+    value:'linked-devices',
+    description: {
+      summary: 'The "linked-devices" query allows a client to provide A&AI a generic-vnf, vserver, or newvce and ' +
+      'retrieve all connected generic-vnfs, vservers, and newvces.',
+      additionalInfo:
+      'Input: generic-vnf, vserver, or newvces\n' +
+      'Output: all connected generic-vnfs, vservers, and newvces\n' +
+      'Users: POLO\n' +
+      'Releases: E1802'
+    }
+  },
+  {
+    placeholder: 'Need ucpe-instance as Start Node',
+    label:'ucpe-instance',
+    value:'ucpe-instance',
+    description: {
+      summary: 'The "ucpe-instance" query allows a client to provide A&AI a physical server or physical network device, ' +
+      'using the hostname, and retrieve the device and the complex it is located in. This includes the pserver or pnf ' +
+      'itself and the complex.',
+      additionalInfo:
+      'Input: pserver or pnf, Using pserver hostname or pnf pnf-name to identify the starting node is preferred.\n' +
+      'Output: the pserver or pnf, related complex\n' +
+      'Users: SNIRO\n' +
+      'Releases: 1702'
+    }
+  }
+];
diff --git a/src/app/customQuery/components/CustomQueryCard.jsx b/src/app/customQuery/components/CustomQueryCard.jsx
new file mode 100644
index 0000000..ffe9748
--- /dev/null
+++ b/src/app/customQuery/components/CustomQueryCard.jsx
@@ -0,0 +1,44 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+const customQueryCard = (props) => {
+
+  console.log('[Custom Query Card] props : ', props);
+  const properties = Object.keys(props.nodeProps).map( (prop, idx) => {
+    return (
+      <p key={idx}><strong> {prop} : </strong> { props.nodeProps[prop]} </p>
+    );
+  });
+
+  return (
+    <Col lg={3} md={3} sm={4}>
+      <div className='card model-card'>
+        <div className='card-header'>
+          Node {props.nodeId}
+        </div>
+        <div className='card-content model-card-content'>
+          {properties}
+        </div>
+      </div>
+    </Col>
+  );
+};
+
+export default customQueryCard;
diff --git a/src/app/main.app.jsx b/src/app/main.app.jsx
index 451ef37..50cc88f 100644
--- a/src/app/main.app.jsx
+++ b/src/app/main.app.jsx
@@ -20,6 +20,7 @@
  */
 import 'resources/scss/bootstrap.scss';
 import 'resources/css/font-awesome.min.css';
+import 'resources/css/bootstrap-slider.css';
 import 'resources/css/react-datepicker.min.css';
 import 'resources/scss/customViews.scss';
 
diff --git a/src/app/model/CustomQueryMultiNode.json b/src/app/model/CustomQueryMultiNode.json
new file mode 100644
index 0000000..598192c
--- /dev/null
+++ b/src/app/model/CustomQueryMultiNode.json
@@ -0,0 +1,83 @@
+{
+  "results":[
+    {
+      "id":"2519120",
+      "node-type":"generic-vnf",
+      "url":"/aai/v12/network/generic-vnfs/generic-vnf/d5b749b2-3b0f-46c4-bf0a-fb55e76866fb",
+      "properties":{
+        "vnf-id":"d5b749b2-3b0f-46c4-bf0a-fb55e76866fb",
+        "vnf-name":"USSTFMBMIIL0101UVHN01",
+        "vnf-type":"HN",
+        "prov-status":"prov",
+        "is-closed-loop-disabled":false,
+        "resource-version":"1492705097080"
+      },
+      "related-to":[
+        {
+          "id":"28274856",
+          "relationship-label":"org.onap.relationships.inventory.ComposedOf",
+          "node-type":"service-instance",
+          "url":"/aai/v12/business/customers/customer/StateFarmSAARTID/service-subscriptions/service-subscription/vHNFaaS/service-instances/service-instance/3f433278-94d6-4203-8bf2-8bd01b82a848"
+        },
+        {
+          "id":"13705400",
+          "relationship-label":"org.onap.relationships.inventory.BelongsTo",
+          "node-type":"l-interface",
+          "url":"/aai/v12/network/generic-vnfs/generic-vnf/d5b749b2-3b0f-46c4-bf0a-fb55e76866fb/l-interfaces/l-interface/ge4"
+        },
+        {
+          "id":"26591400",
+          "relationship-label":"org.onap.relationships.inventory.BelongsTo",
+          "node-type":"l-interface",
+          "url":"/aai/v12/network/generic-vnfs/generic-vnf/d5b749b2-3b0f-46c4-bf0a-fb55e76866fb/l-interfaces/l-interface/ge5"
+        },
+        {
+          "id":"5664936",
+          "relationship-label":"tosca.relationships.HostedOn",
+          "node-type":"vserver",
+          "url":"/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/USSTFMBMIIL0101UJZZ01%3A%3AuCPE-VMS/vservers/vserver/5fbeb08c-bc6f-4bd1-9129-36852c014f72"
+        }
+      ]
+    },
+    {
+      "id":"23769160",
+      "node-type":"pserver",
+      "url":"/aai/v12/cloud-infrastructure/pservers/pserver/USSTFMBMIIL0101UJZZ01",
+      "properties":{
+        "hostname":"USSTFMBMIIL0101UJZZ01",
+        "ptnii-equip-name":"USSTFMBMIIL0101UJZZ01",
+        "equip-type":"JUNIPER-UCPE",
+        "equip-vendor":"JUNIPER",
+        "equip-model":"ATT-U210",
+        "serial-number":"JUNIPER-UCPE",
+        "resource-version":"1492639826832"
+      },
+      "related-to":[
+        {
+          "id":"5664936",
+          "relationship-label":"tosca.relationships.HostedOn",
+          "node-type":"vserver",
+          "url":"/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/USSTFMBMIIL0101UJZZ01%3A%3AuCPE-VMS/vservers/vserver/5fbeb08c-bc6f-4bd1-9129-36852c014f72"
+        },
+        {
+          "id":"22016072",
+          "relationship-label":"tosca.relationships.HostedOn",
+          "node-type":"vserver",
+          "url":"/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/USSTFMBMIIL0101UJZZ01%3A%3AuCPE-VMS/vservers/vserver/8ed14c24-f002-4a2c-8216-0303e79488d0"
+        },
+        {
+          "id":"2093224",
+          "relationship-label":"tosca.relationships.network.BindsTo",
+          "node-type":"p-interface",
+          "url":"/aai/v12/cloud-infrastructure/pservers/pserver/USSTFMBMIIL0101UJZZ01/p-interfaces/p-interface/ge-0%2F0%2F9"
+        },
+        {
+          "id":"19787800",
+          "relationship-label":"tosca.relationships.network.BindsTo",
+          "node-type":"p-interface",
+          "url":"/aai/v12/cloud-infrastructure/pservers/pserver/USSTFMBMIIL0101UJZZ01/p-interfaces/p-interface/ge-0%2F0%2F8"
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/app/model/ModelDisplay.jsx b/src/app/model/ModelDisplay.jsx
new file mode 100644
index 0000000..59dc05a
--- /dev/null
+++ b/src/app/model/ModelDisplay.jsx
@@ -0,0 +1,35 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import ModelGallery from 'app/modelSearch/components/ModelGallery.jsx';
+import ModelBreadcrumb from 'app/modelSearch/components/ModelBreadcrumb.jsx';
+//import modelCard from 'app/modelSearch/components/ModelCard.jsx';
+//import modelRelationships from 'app/modelSearch/components/ModelRelationships.jsx';
+
+
+
+
+//export const ModelGallery = modelGallery;
+//export const ModelCard = modelCard;
+//export const ModelRelationships = modelRelationships;
+
+export default ModelGallery;
+//export default modelCard;
+//export default modelRelationships;
diff --git a/src/app/model/history/History.jsx b/src/app/model/history/History.jsx
new file mode 100644
index 0000000..61cb1af
--- /dev/null
+++ b/src/app/model/history/History.jsx
@@ -0,0 +1,716 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+
+import commonApi from 'utils/CommonAPIService.js';
+import deepDiffMapper from 'utils/DiffUtil.js';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+import Spinner from 'utils/SpinnerContainer.jsx';
+
+import HistoryGallery from './components/HistoryGallery.jsx';
+import HistoryCard from './components/HistoryCard.jsx';
+import NodeDiffCard from './components/NodeDiffCard.jsx';
+import AnimationControls from './components/AnimationControls.jsx';
+import moment from "moment";
+import Grid from 'react-bootstrap/lib/Grid';
+import Row from 'react-bootstrap/lib/Row';
+import Col from 'react-bootstrap/lib/Col';
+import Button from 'react-bootstrap/lib/Button';
+import Modal from 'react-bootstrap/lib/Modal';
+import Pagination from 'react-js-pagination';
+import { HistoryConstants } from './HistoryConstants';
+import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger';
+import Tooltip from 'react-bootstrap/lib/Tooltip';
+import ReactBootstrapSlider from 'react-bootstrap-slider';
+
+let INVLIST = GlobalExtConstants.INVLIST;
+/**
+ * This class is used to handle any url interactions for models.
+ * When a user selects a inventory item in browse or special search,
+ * this model class should be used to handle the url + params and query
+ * the proxy server.
+ */
+
+class History extends Component {
+
+  elements = [];
+  pageTitle = '';
+  nodeType = '';
+  nodeResults = '';
+  payload = {start : atob(this.props.match.params.nodeUriEnc)};
+
+  constructor(props) {
+    console.log(props);
+    super(props);
+    this.state = {
+                  activePage: 1,
+                  totalResults: 0,
+                  enableBusyFeedback: true,
+                  enableBusyRecentFeedback: true,
+                  enableBusyHistoryStateFeedback: true,
+                  enableBusyDiffFeedback: true,
+                  data: [],
+                  nodes: [],
+                  nodeCurrentState: null,
+                  nodeHistoryState: null,
+                  showHistoryModal: false,
+                  splitScreenCard: false,
+                  entries: [],
+                  filteredEntries: [],
+                  isLifeCycle: false,
+                  isState: false,
+                  currentStateHistoryValue: parseInt(this.props.match.params.epochTime),
+                  stepEpochStateTime: 1000,
+                  maxEpochStartTime: Math.round(new Date().getTime()),
+                  minEpochStartTime: parseInt(this.props.match.params.epochTime) - 259200000,
+                  nodeDiff: null,
+                  showSlider: false,
+                  sliderTickArray: null,
+                  showTicks: INVLIST.showTicks,
+                  selectedHistoryStateFormatted: moment(parseInt(this.props.match.params.epochTime)).format('dddd, MMMM Do, YYYY h:mm:ss A'),
+                  nodeDisplay: (this.props.match.params.nodeType).toUpperCase(),// + ' : ' + (atob(this.props.match.params.nodeUriEnc)).split(this.props.match.params.nodeType + '\/').pop(),
+                  nodeName: (this.props.match.params.nodeType).toUpperCase(),
+                  historyErrMsg: null,
+                  changesErrMsg: null,
+                  lifecycleErrMsg: null,
+                  currentErrMsg: null
+                };
+                console.log('minEpochStateTime: '+this.state.minEpochStateTime);
+                console.log('maxEpochStartTime: '+this.state.maxEpochStartTime);
+                console.log('stepEpochStateTime: '+this.state.stepEpochStateTime);
+                console.log('currentStateHistoryValue: '+this.state.currentStateHistoryValue);
+
+  }
+  resultsMessage = '';
+  componentDidMount = () => {
+    console.log('[History.jsx] componentDidMount props available are', JSON.stringify(this.props));
+    if(INVLIST.isHistoryEnabled){
+        this.beforefetchInventoryData();
+    }
+  };
+  componentWillUnmount  = () => {
+    console.log('[History.jsx] componentWillUnMount');
+  }
+  getUnixSecondsFromMs = (ms) => {
+    return ms/1000;
+  }
+  beforefetchInventoryData = (param) => {
+    if (param) {
+      this.setState(
+        { enableBusyFeedback: true, activePage: 1, totalResults: 0},
+        function () { this.fetchInventoryData(param); }.bind(this)
+      );
+    } else {
+      this.fetchInventoryData();
+    }
+  };
+    initState = () =>{
+        this.setState({
+              activePage: 1,
+              totalResults: 0,
+              enableBusyFeedback: true,
+              enableBusyRecentFeedback: true,
+              enableBusyHistoryStateFeedback: true,
+              enableBusyDiffFeedback: true,
+              data: [],
+              nodes: [],
+              nodeCurrentState: null,
+              nodeHistoryState: null,
+              showHistoryModal: false,
+              splitScreenCard: false,
+              entries: [],
+              filteredEntries: [],
+              isLifeCycle: false,
+              isState: false,
+              stepEpochStateTime: 1000,
+              maxEpochStartTime: Math.round(new Date().getTime()),
+              minEpochStartTime: parseInt(this.props.match.params.epochTime) - 259200000,
+              nodeDiff: null,
+              showSlider: false,
+              sliderTickArray: null,
+              showTicks: INVLIST.showTicks,
+              nodeDisplay: (this.props.match.params.nodeType).toUpperCase(),// + ' : ' + (atob(this.props.match.params.nodeUriEnc)).split(this.props.match.params.nodeType + '\/').pop(),
+              nodeName: (this.props.match.params.nodeType).toUpperCase(),
+              historyErrMsg: null,
+              changesErrMsg: null,
+              lifecycleErrMsg: null,
+              currentErrMsg: null
+            });
+      }
+  getSettings = () => {
+    const settings = {
+          'NODESERVER': INVLIST.NODESERVER,
+          'PROXY': INVLIST.PROXY,
+          'PREFIX': INVLIST.PREFIX,
+          'VERSION': INVLIST.VERSION,
+          'USESTUBS': INVLIST.useStubs
+        };
+    return settings;
+  }
+  fetchInventoryData = (param) => {
+    console.log('fetchInventoryData', param);
+    this.resultsMessage = '';
+    let settings = this.getSettings();
+    const inventory = INVLIST.INVENTORYLIST;
+    let url = '';
+    console.log('[History.jsx] fetchInventoryData nodeUriEnc= ', atob(this.props.match.params.nodeUriEnc));
+    let pageName = "History";
+    this.nodeResults = '';
+    switch(this.props.match.params.type){
+        case('nodeState'):
+            this.setState({splitScreenCard: true, isState: true, showState: true});
+            this.getCurrentStateCall(settings);
+            this.pageTitle = "State of "+ this.state.nodeDisplay +" at "+ moment(parseInt(this.props.match.params.epochTime)).format('dddd, MMMM Do, YYYY h:mm:ss A');
+            break;
+        case('nodeLifeCycleSince'):            
+            this.setState({splitScreenCard: false, isLifeCycle: true, showLifeCycle: true});
+            this.getCurrentStateCall(settings);
+            this.commonApiServiceCall(settings, null);
+            this.pageTitle = "Network element state(s) of "+  this.state.nodeDisplay;
+            break;
+        case('nodeLifeCycle'):
+            this.setState({splitScreenCard: false, isLifeCycle: true, showLifeCycle: true});
+            this.getCurrentStateCall(settings);
+            this.commonApiServiceCall(settings, null);
+            this.pageTitle = "Network element state(s) of "+  this.state.nodeDisplay;            
+            break;
+        default:
+            this.pageTitle = "History";
+            this.setState({splitScreenCard: false, isLifeCycle: true, showLifeCycle: true});
+            this.getCurrentStateCall(settings);
+            this.commonApiServiceCall(settings, null);
+    }
+    console.log('[History.jsx] active page', this.state.activePage);
+  };
+  generateEntries = (properties, relationships, actions) =>{
+    let tempEntries = [];
+    if(properties){
+        for (var i = 0; i < properties.length; i++) {
+            properties[i].displayTimestamp =  moment(properties[i].timestamp).format('dddd, MMMM Do, YYYY h:mm:ss A');
+            properties[i].timeRank = properties[i].timestamp;
+            properties[i].type = "attribute";
+            properties[i].header = "Attribute: " + properties[i].key;
+            if(properties[i].value !== null && properties[i].value !== 'null'){
+                properties[i].action = "Updated";
+                properties[i].body   = "Updated to value: " + properties[i].value;
+            }else{
+                properties[i].action = "Deleted";
+                properties[i].body   = "Removed";
+            }
+            properties[i]['tx-id'] = (properties[i]['tx-id']) ? properties[i]['tx-id'] : 'N/A';
+            tempEntries.push(properties[i]);
+        }
+    }
+    if(actions){
+        for (var k = 0; k < actions.length; k++) {
+            actions[k].displayTimestamp =  moment(actions[k].timestamp).format('dddd, MMMM Do, YYYY h:mm:ss A');
+            actions[k].timeRank = actions[k].timestamp;
+            actions[k].type = "action";
+            actions[k].header = "Action: " + actions[k].action;
+            if(actions[k].action === 'CREATED'){
+                actions[k].action = "Created";
+                actions[k].body   = "Network Element Created";
+            }else if(actions[k].action === 'DELETED'){
+                actions[k].action = "Deleted";
+                actions[k].body   = "Network Element Removed";
+            }
+            actions[k]['tx-id'] = (actions[k]['tx-id']) ? actions[k]['tx-id'] : 'N/A';
+            tempEntries.push(actions[k]);
+        }
+    }
+    if(relationships){
+        for (var j = 0; j < relationships.length; j++) {
+            if(relationships[j].timestamp){
+                relationships[j].dbStartTime = relationships[j].timestamp;
+                relationships[j].displayTimestamp =  moment(relationships[j].dbStartTime).format('dddd, MMMM Do, YYYY h:mm:ss A');
+                relationships[j].timeRank = relationships[j].dbStartTime;
+                relationships[j].type   = "relationship";
+                relationships[j].header = "Relationship added";
+                relationships[j].body   = "The relationship with label " + relationships[j]['relationship-label'] + " was added from this node to the "+ relationships[j]['node-type'] +" at " + relationships[j].url;
+                relationships[j].action = "Added";
+                relationships[j]['tx-id'] = (relationships[j]['tx-id']) ? relationships[j]['tx-id'] : 'N/A';
+                let additions = JSON.parse(JSON.stringify(relationships[j]));
+                tempEntries.push(additions);
+            }
+            if(relationships[j]['end-timestamp']){
+                 relationships[j].dbEndTime = relationships[j]['end-timestamp'];
+                 relationships[j].sot = relationships[j]['end-sot'];
+                 relationships[j].displayTimestamp =  moment(relationships[j].dbEndTime).format('dddd, MMMM Do, YYYY h:mm:ss A');
+                 relationships[j].timeRank = relationships[j].dbEndTime;
+                 relationships[j].header = "Relationship removed";
+                 relationships[j].body   = "The " + relationships[j]['node-type'] +" : " + relationships[j].url + " relationship with label " + relationships[j]['relationship-label'] + " was removed from this node.";
+                 relationships[j].type   = "relationship";
+                 relationships[j].action = "Deleted";
+                 relationships[j]['tx-id'] = (relationships[j]['tx-id']) ? relationships[j]['tx-id'] : 'N/A';
+                 let deletions = JSON.parse(JSON.stringify(relationships[j]));
+                 tempEntries.push(deletions);
+            }
+        }
+    }
+
+    let tempEntriesSorted = tempEntries.sort(function(a, b) {
+                                                       var compareA = a.timeRank;
+                                                       var compareB = b.timeRank;
+                                                       if(compareA > compareB) return -1;
+                                                       if(compareA < compareB) return 1;
+                                                       return 0;
+                                                      });
+
+    this.setState({
+                totalResults : tempEntriesSorted.length,
+                entries : tempEntriesSorted,
+                filteredEntries: tempEntriesSorted
+              });
+
+  }
+  triggerHistoryStateCall = (nodeUri, epochTime) =>{
+     //get url for historical call
+     let settings = this.getSettings();
+     window.scrollTo(0, 400);
+      this.setState({
+                     enableBusyHistoryStateFeedback : true,
+                     enableBusyDiffFeedback: true
+                   });
+     this.getHistoryStateCall(settings, null, null, epochTime);
+  }
+  generateDiffArray = (arr) => {
+    let tempArray = {};
+    tempArray['properties'] = [];
+    tempArray['related-to'] = [];
+
+    for (var i = 0; i < arr.properties.length; i++ ){
+        tempArray['properties'][arr.properties[i].key] = arr.properties[i];
+    }
+    for (var j = 0; j < arr['related-to'].length; j++ ){
+        //TODO use id if it is coming
+        tempArray['related-to'][arr['related-to'][j].url] = arr['related-to'][j];
+    }
+    return tempArray;
+  }
+  getCurrentStateCall = (settings,url,param) =>{
+      this.setState({currentErrMsg:null});
+      commonApi(settings, "query?format=state", 'PUT', this.payload, 'currentNodeState', null, 'history-traversal')
+      .then(res => {
+        let node = atob(this.props.match.params.nodeUriEnc).split(res.data.results[0]['node-type'] + '\/').pop();
+        res.data.results[0].primaryHeader = 'Current state of ' + this.state.nodeName + ' - ' + node;
+        res.data.results[0].secondaryHeader = atob(this.props.match.params.nodeUriEnc);
+        this.setState(
+        {
+          nodeCurrentState : res.data.results[0],
+          enableBusyRecentFeedback: false,
+          nodeDisplay :node
+        });
+        if(this.props.match.params.type === 'nodeState'){
+            this.getHistoryStateCall(settings, null);
+        }
+        console.log('After recent node service call ......',this.state);
+        console.log('[History.jsx] recent node results : ',  res.data.results[0]);
+        }, error=>{
+          this.triggerError(error, "current");
+        }).catch(error => {
+          this.triggerError(error, 'current');
+        });
+  };
+  getHistoryStateCall = (settings, url, param, timeStamp) =>{
+      let ts = this.state.currentStateHistoryValue;
+      if(timeStamp){
+        ts = parseInt(timeStamp);
+      }
+      if(this.state.showTicks){
+        this.setState({changesErrMsg:null});
+        commonApi(settings, "query?format=changes", 'PUT', this.payload, 'historicalNodeStateChanges', null, 'history-traversal')
+        .then(res => {
+          let tickTempArray = [];
+          for(var j = 0; j <  res.data.results.length; j++ ){
+              for(var k = 0; k < res.data.results[j].changes.length; k++){
+                  if(!tickTempArray.includes(res.data.results[j].changes[k])){
+                      tickTempArray.push(res.data.results[j].changes[k]);
+                  }
+              }
+          }
+          let tickArray = tickTempArray.sort(function(a, b) {
+                                                                 var compareA = a;
+                                                                 var compareB = b;
+                                                                 if(compareA < compareB) return -1;
+                                                                 if(compareA > compareB) return 1;
+                                                                 return 0;
+                                                                });
+          console.log("tick array: " + tickArray);
+          this.setState({showSlider:true, sliderTickArray: tickArray});
+        }, error=>{
+          this.triggerError(error, "changes");
+        }).catch(error => {
+          this.triggerError(error, 'changes');
+        });
+      }else{
+        this.setState({showSlider:true});
+      }
+      this.setState({historyErrMsg:null});
+      commonApi(settings, "query?format=state&startTs=" + ts + "&endTs=" + ts, 'PUT', this.payload, 'historicalNodeState', null, 'history-traversal')
+      .then(res => {
+         let node = atob(this.props.match.params.nodeUriEnc).split(res.data.results[0]['node-type'] + '\/').pop();
+         res.data.results[0].primaryHeader = 'Historical state of '+ this.state.nodeName + ' - ' + node + ' as of ' + moment(parseInt(this.props.match.params.epochTime)).format('dddd, MMMM Do, YYYY h:mm:ss A');
+         res.data.results[0].secondaryHeader = atob(this.props.match.params.nodeUriEnc);
+        this.setState(
+        {
+          showState: true,
+          splitScreenCard: true,
+          nodeHistoryState :  res.data.results[0],
+          enableBusyHistoryStateFeedback: false
+        });
+        console.log('After historical node state service call ......',this.state);
+        console.log('[History.jsx] historical node state results : ',  res.data.results[0]);
+        if(this.state.nodeHistoryState != null && this.state.nodeCurrentState != null){
+                    let nodeDiffHistoryArr = this.generateDiffArray(this.state.nodeHistoryState);
+                    let nodeDiffCurrentArr = this.generateDiffArray(this.state.nodeCurrentState);
+                    var result = deepDiffMapper.map(nodeDiffHistoryArr, nodeDiffCurrentArr);
+                    console.log("diff map" + result);
+                    this.setState({ nodeDiff: result, enableBusyDiffFeedback: false });
+                }else{
+                    this.setState({ enableBusyDiffFeedback: false });
+         }
+      }, error=>{
+          this.triggerError(error, "historic");
+      }).catch(error => {
+          this.triggerError(error, 'historic');
+      });
+
+  };
+
+  commonApiServiceCall = (settings,url,param) =>{
+    let path = "query?format=lifecycle";
+    let stubPath = "nodeLifeCycle";
+    if(this.props.match.params.type === "nodeLifeCycleSince"){
+        path += "&startTs=" + parseInt(this.props.match.params.epochTime);
+        stubPath += "Since";
+    }
+    this.setState({lifecycleErrMsg:null});
+    commonApi(settings, path, 'PUT', this.payload, stubPath, null, 'history-traversal')
+      .then(res => {
+        // Call dispatcher to update state
+        console.log('once before service call ......',this.state);
+        let resp =  res.data.results[0];
+        this.resultsMessage = '';
+        let totalResults = 0;
+        if(resp && resp.properties.length + resp['related-to'].length > 0){
+            if(this.props.match.params.type === "nodeState"){
+                totalResults = 1;
+            }else{
+                //wait to generate entries to set this
+                totalResults = 0;
+            }
+        }
+        this.setState(
+          {
+            totalResults : totalResults,
+            enableBusyFeedback:false,
+          });
+        if(resp){
+            this.generateEntries(resp.properties, resp['related-to'], resp['node-actions']);
+        }
+        console.log('After service call ......',this.state);
+        console.log('[History.jsx] results : ', resp);
+      }, error=>{
+        this.triggerError(error, 'lifecycle');
+      }).catch(error => {
+        this.triggerError(error, 'lifecycle');
+      });
+  };
+  triggerError = (error, type) => {
+      console.error('[History.jsx] error : ', JSON.stringify(error));
+    	let errMsg = '';
+    	if (error.response) {
+    		// The request was made and the server responded with a status code
+    		// that falls out of the range of 2xx
+    		console.log(error.response.data);
+    		console.log(error.response.status);
+    		console.log(error.response.headers);
+    		if(error.response.status){
+    		    errMsg += " Code: " + error.response.status;
+    		}
+    		if(error.response.data){
+              errMsg += " - " + JSON.stringify(error.response.data);
+          }
+    	} else if (error.request) {
+    		// The request was made but no response was received
+    		// `error.request` is an instance of XMLHttpRequest in the browser and an instance of
+    		// http.ClientRequest in node.js
+    		console.log(error.request);
+    		errMsg += " - Request was made but no response received";
+    	} else {
+    		// Something happened in setting up the request that triggered an Error
+    		console.log('Error', error.message);
+    		errMsg += " - Unknown error occurred " + error.message;
+    	}
+    	//Suppress 404's because that is just no results
+        if(error.response && error.response.status === 404){
+           errMsg = '';
+        }
+    	if(type === 'lifecycle'){
+    	     this.setState({
+                    lifecycleErrMsg: errMsg,
+                    enableBusyFeedback: false,
+                    totalResults: 0
+                  });
+    	}else if (type === 'changes'){
+    	     this.setState({
+    	            showSlider:true,
+    	            changesErrMsg: errMsg
+    	     });
+    	}else if (type === 'historic'){
+    	    console.log('[History.jsx] historical node state error : ', error);
+            this.setState(
+            {
+              showState: true,
+              splitScreenCard: true,
+              nodeHistoryState : null,
+              enableBusyHistoryStateFeedback:false,
+              enableBusyDiffFeedback:false,
+              historyErrMsg: errMsg
+            });
+    	}else if (type === 'current'){
+            this.setState(
+            {
+              nodeCurrentState : null,
+              currentErrMsg: errMsg,
+              enableBusyRecentFeedback:false
+            });
+    	}else{
+    	    console.log('[History.jsx] triggerError method called without a type.' );
+    	}
+    }
+
+  componentWillReceiveProps(nextProps) {
+    console.log('[History.jsx] componentWillReceiveProps');
+    console.log('[History.jsx] next nodeUri:', atob(nextProps.match.params.nodeUriEnc));
+    console.log('[History.jsx] this nodeUri:', atob(this.props.match.params.nodeUriEnc));
+
+    if (nextProps.match.params.nodeUriEnc
+            && nextProps.match.params.type
+            && nextProps.match.params.epochTime
+            && ((nextProps.match.params.nodeUriEnc !== this.props.match.params.nodeUriEnc) ||
+                (nextProps.match.params.type !== this.props.match.params.type) ||
+                (nextProps.match.params.epochTime !== this.props.match.params.epochTime))
+    ) {
+      this.initState();
+      this.props = nextProps;
+      this.beforefetchInventoryData();
+    }
+  };
+
+  handlePageChange = (pageNumber) => {
+    console.log('[History.jsx] HandelPageChange active page is', pageNumber);
+    this.setState(
+      { activePage: pageNumber, enableBusyFeedback: true },
+      function () { this.beforefetchInventoryData(); }.bind(this)
+    );
+  };
+
+  // HELPER FUNCTIONS
+  isContaining = (nameKey, listArray) => {
+    let found = false;
+    listArray.map((lists) => {
+      if (lists.id === nameKey) {
+        found = true;
+      }
+    });
+    return found;
+  };
+
+  stateHistoryFormat = (event) =>{
+     this.setState({ currentStateHistoryValue: event.target.value, selectedHistoryStateFormatted: moment(event.target.value).format('dddd, MMMM Do, YYYY h:mm:ss A')});
+  };
+  changeHistoryState = () =>{
+    console.log('minEpochStateTime: ' + this.state.minEpochStateTime);
+    console.log('maxEpochStartTime: ' + this.state.maxEpochStartTime);
+    console.log('stepEpochStateTime: ' + this.state.stepEpochStateTime);
+    console.log('currentStateHistoryValue: ' + this.state.currentStateHistoryValue);
+    console.log("Calling the route again with a new timestamp");
+    this.props.history.push('/history/' + this.props.match.params.type + '/' + this.props.match.params.nodeType + '/' + this.props.match.params.nodeUriEnc + '/' + this.state.currentStateHistoryValue);
+  }
+  filterList = (event) =>{
+     var updatedList = this.state.entries;
+     updatedList = updatedList.filter((entry) =>{
+       return JSON.stringify(entry).toLowerCase().search(
+         event.target.value.toLowerCase()) !== -1;
+     });
+     this.setState({filteredEntries: updatedList, totalResults: updatedList.length});
+   }
+
+   setHistoricStateValues = (currValue) =>{
+     this.setState({currentStateHistoryValue: currValue, selectedHistoryStateFormatted: moment(currValue).format('dddd, MMMM Do, YYYY h:mm:ss A')});
+   }
+
+   navigateHistory = (time) =>{
+     this.props.history.push('/history/' + this.props.match.params.type + '/' + this.props.match.params.nodeType + '/' + this.props.match.params.nodeUriEnc + '/' + time);
+   }
+
+   setStateValue = (key, value) =>{
+      this.setState((state) => { key : value });
+   }
+   getStateValue = (stateVar) => {
+     return this.state[stateVar];
+   }
+
+  render() {
+    console.log('[History Props] render: ', JSON.stringify(this.props) + 'elements : ', this.elements);
+    console.log('[History nodeUri] render: ', atob(this.props.match.params.nodeUriEnc));
+    if(INVLIST.isHistoryEnabled){
+        return (
+          <div>
+          <header className='addPadding jumbotron my-4'>
+            <h1 className='display-2'>Network Element History</h1>
+            <p className='lead'>
+              On this page you have the ability to view a network element in its current and historic state.
+              The attributes are clickable to view extended information about who and when they were last updated.
+              {this.props.match.params.type === "nodeLifeCycle" || this.props.match.params.type === "nodeLifeCycleSince"
+              ? 'The table at the bottom of the page shows a list of all updates made on the network element (it is filterable).\n' +
+                'Click an update in that table to rebuild the historic state at the time of the update.\n' +
+                'A difference will be displayed between the current state and the historic state in the center.' : ''}
+            </p>
+          </header>
+          <Grid fluid={true} className='addPadding'>
+            <Row>
+              <Col className='col-lg-12'>
+                    <div className='card d3-model-card'>
+                      <div className='card-header model-card-header'>
+                        <h2>{this.pageTitle}</h2>
+                      </div>
+                      <Row className={this.state.changesErrMsg ? 'show' : 'hidden'} >
+                        <div className='addPaddingTop alert alert-danger' role="alert">
+                            An error occurred while trying to get the state changes, please try again later. If this issue persists, please contact the system administrator. {this.state.changesErrMsg}
+                        </div>
+                      </Row>
+                      { (this.state.isState && this.state.showSlider && this.state.showTicks) && (
+                      <div className='card-header'>
+                        <Row className='show-grid'>
+                           <Col md={3}>
+                               <ReactBootstrapSlider
+                                     value={this.state.currentStateHistoryValue}
+                                     change={this.stateHistoryFormat}
+                                     slideStop={this.stateHistoryFormat}
+                                     step={ 1 }
+                                     ticks={ this.state.sliderTickArray }
+                                     ticks_snap_bounds={ 10000 }
+                                     orientation="horizontal" />
+                                   <p>{this.state.selectedHistoryStateFormatted}</p>
+                                   <button type='button' className='btn btn-outline-primary' onClick={this.changeHistoryState}>Refresh</button>
+                           </Col>
+                           <AnimationControls playControlsDisabled={true} get={this.getStateValue} set={this.setStateValue} tickArray={this.state.sliderTickArray} currentValue={this.state.currentStateHistoryValue} setValueState={this.setHistoricStateValues} setNavigate={this.navigateHistory} />
+                        </Row>
+                      </div>)}
+                      { (this.state.isState && this.state.showSlider && !this.state.showTicks) && (
+                      <div className='card-header'>
+                        <Row className='show-grid'>
+                           <Col md={12}>
+                                <ReactBootstrapSlider
+                                      value={this.state.currentStateHistoryValue}
+                                      change={this.stateHistoryFormat}
+                                      slideStop={this.stateHistoryFormat}
+                                      step={this.state.stepEpochStateTime}
+                                      max={this.state.maxEpochStartTime}
+                                      min={this.state.minEpochStartTime}
+                                      orientation="horizontal" />
+                                   <p>{this.state.selectedHistoryStateFormatted}</p>
+                                   <button type='button' className='btn btn-outline-primary' onClick={this.changeHistoryState}>Refresh</button>
+                           </Col>
+                        </Row>
+                      </div>)}
+                      <div className='card-content model-card-content'>
+                        <div>
+                              <Row className='show-grid'>
+                                <Col md={12}>
+                                  <Spinner loading={this.state.enableBusyHistoryStateFeedback && this.state.showState}>
+                                    {this.state.showState && !this.historyErrMsg && (<HistoryCard split={this.state.splitScreenCard} node={this.state.nodeHistoryState}/>)}
+                                    <Row className={this.state.historyErrMsg ? 'show' : 'hidden'} >
+                                      <div className='addPaddingTop alert alert-danger' role="alert">
+                                          An error occurred while trying to get the historic state, please try again later. If this issue persists, please contact the system administrator. {this.state.historyErrMsg}
+                                      </div>
+                                    </Row>
+                                  </Spinner>
+                                  <Spinner loading={this.state.showState && this.state.enableBusyDiffFeedback}>
+                                    {this.state.showState && (<NodeDiffCard diff={this.state.nodeDiff}/>)}
+                                  </Spinner>
+                                  <Spinner loading={this.state.enableBusyRecentFeedback}>
+                                    { !this.currentErrMsg && (<HistoryCard split={this.state.splitScreenCard} node={this.state.nodeCurrentState}/>)}
+                                    <Row className={this.state.currentErrMsg ? 'show' : 'hidden'} >
+                                      <div className='addPaddingTop alert alert-danger' role="alert">
+                                          An error occurred while trying to get the current state, please try again later. If this issue persists, please contact the system administrator. {this.state.currentErrMsg}
+                                      </div>
+                                    </Row>
+                                  </Spinner>
+                                  <hr />
+                                  <span className='resultMessage'>{this.resultsMessage}</span>
+                                </Col>
+                              </Row>
+                        </div>
+                      </div>
+                      <div className='card-footer'>
+                         <strong>Tip:</strong> <em>Click any attribute to view more details</em>
+                      </div>
+                   </div>
+              </Col>
+            </Row>
+            <Row>
+                <div className={'addPaddingTop alert alert-danger ' + (this.state.lifecycleErrMsg ? 'show' : 'hidden')} role="alert">
+                    An error occurred while trying to get the list of updates on the current node, please try again later. If this issue persists, please contact the system administrator. {this.state.lifecycleErrMsg}
+                </div>
+            {this.state.showLifeCycle && !this.state.lifecycleErrMsg && (
+               <Col className='col-lg-12'>
+                     <div className='card d3-model-card'>
+                       <div className='card-header model-card-header'>
+                         <h2 className={this.props.match.params.type === "nodeLifeCycle" ? 'show' : 'hidden'}>All Updates on {this.state.nodeDisplay}</h2>
+                         <h2 className={this.props.match.params.type === "nodeLifeCycleSince" ? 'show' : 'hidden'}>All Updates on {this.state.nodeDisplay} Since {this.state.selectedHistoryStateFormatted}</h2>
+                       </div>
+                       <div className='card-header'>
+                            <p><strong>Tip:</strong> <em>Click any update to view the state of the node at that point in time</em></p>
+                            <div>
+                              <h5>Total Results: <strong>{this.state.totalResults}</strong></h5>
+                            </div>
+                            <div>
+                                <form>
+                                    <fieldset className="form-group">
+                                        <input type="text" className="form-control form-control-lg" placeholder="Search" onChange={this.filterList}/>
+                                    </fieldset>
+                                </form>
+                            </div>
+                       </div>
+                       <div className='card-content model-card-content'>
+                            <Spinner loading={this.state.enableBusyFeedback}>
+                              <div>
+                                  <HistoryGallery nodeId={atob(this.props.match.params.nodeUriEnc)} entries={this.state.filteredEntries} triggerState={this.triggerHistoryStateCall}/>
+                              </div>
+                            </Spinner>
+                       </div>
+                     </div>
+                </Col> )}
+              </Row>
+          </Grid>
+          </div>
+        );
+     }else{
+        return(<p>History Not Enabled for this instance, please check config.</p>)
+     }
+   }
+}
+
+export default History;
diff --git a/src/app/model/history/HistoryActions.js b/src/app/model/history/HistoryActions.js
new file mode 100644
index 0000000..4060806
--- /dev/null
+++ b/src/app/model/history/HistoryActions.js
@@ -0,0 +1,19 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
diff --git a/src/app/model/history/HistoryConstants.js b/src/app/model/history/HistoryConstants.js
new file mode 100644
index 0000000..2d4108e
--- /dev/null
+++ b/src/app/model/history/HistoryConstants.js
@@ -0,0 +1,25 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+export const HistoryConstants = {
+  UPDATE_INVENTORY_DATA : 'UPDATE_INVENTORY_DATA',
+  RESULTS_PER_PAGE : 50 ,
+  PAGE_RANGE_DISPLAY : 10
+};
diff --git a/src/app/model/history/HistoryQuery.jsx b/src/app/model/history/HistoryQuery.jsx
new file mode 100644
index 0000000..f001f97
--- /dev/null
+++ b/src/app/model/history/HistoryQuery.jsx
@@ -0,0 +1,814 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+
+import commonApi from 'utils/CommonAPIService.js';
+import deepDiffMapper from 'utils/DiffUtil.js';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+
+import moment from "moment";
+import Grid from 'react-bootstrap/lib/Grid';
+import Row from 'react-bootstrap/lib/Row';
+import Col from 'react-bootstrap/lib/Col';
+import Button from 'react-bootstrap/lib/Button';
+import Modal from 'react-bootstrap/lib/Modal';
+import * as d3 from "d3";
+import 'd3-selection-multi';
+import ReactBootstrapSlider from 'react-bootstrap-slider';
+import HistoryCard from './components/HistoryCard.jsx';
+import NodeDiffCard from './components/NodeDiffCard.jsx';
+import AnimationControls from './components/AnimationControls.jsx';
+import TopologyDiffCard from './components/TopologyDiffCard.jsx';
+import OutputVisualization, {Visualization} from 'generic-components/OutputVisualization.jsx';
+
+
+
+let INVLIST = GlobalExtConstants.INVLIST;
+
+/**
+ * This class is to show visualizations of queries and show a historical state
+ */
+
+class HistoryQuery extends Component {
+
+  svgWidth = window.outerWidth * 0.8;
+  elements = [];
+  pageTitle = '';
+  nodeType = '';
+  nodeResults = '';
+
+  constructor(props) {
+    console.log(props);
+    super(props);
+    this.state = {
+                      totalResults: 0,
+                      enableBusyRecentFeedback: true,
+                      enableBusyHistoryStateFeedback: true,
+                      enableBusyDiffFeedback: true,
+                      data: [],
+                      nodes: [],
+                      payload: ((this.props.match.params.type == 'cq') ? atob(this.props.match.params.payloadEnc) : { "dsl" : atob(this.props.match.params.payloadEnc)}),
+                      topologyCurrentState: null,
+                      topologyHistoryState: null,
+                      currentStateHistoryValue: parseInt(this.props.match.params.epochTime),
+                      stepEpochStateTime: 1000,
+                      maxEpochStartTime: Math.round(new Date().getTime()),
+                      minEpochStartTime: parseInt(this.props.match.params.epochTime) - 259200000,
+                      nodeDiff: null,
+                      selectedHistoryStateFormatted: moment(parseInt(this.props.match.params.epochTime)).format('dddd, MMMM Do, YYYY h:mm:ss A'),
+                      queryDisplay: ((this.props.match.params.type == 'cq') ?  JSON.parse(atob(this.props.match.params.payloadEnc)).query : atob(this.props.match.params.payloadEnc)),
+                      currentGraphNodes: [],
+                      currentGraphLinks: [],
+                      historicGraphNodes: [],
+                      historicGraphLinks: [],
+                      selectedNodeHistoryState: null,
+                      selectedNodeCurrentState: null,
+                      showNodeModal: false,
+                      showTopologyDiffModal: false,
+                      nodeDisplay: '',
+                      totalDiff: null,
+                      showSlider: false,
+                      sliderTickArray: null,
+                      showTicks: INVLIST.showTicks,
+                      rawMappedCurrentState: null,
+                      rawMappedHistoricState: null,
+                      isPlaying: false,
+                      isPaused: false,
+                      isStopped: false,
+                      intervalId: null,
+                      diffOverlayOn: false,
+                      currentErrMsg: null,
+                      historicErrMsg: null
+
+                    };
+     console.log('minEpochStateTime: '+this.state.minEpochStateTime);
+     console.log('maxEpochStartTime: '+this.state.maxEpochStartTime);
+     console.log('stepEpochStateTime: '+this.state.stepEpochStateTime);
+     console.log('currentStateHistoryValue: '+this.state.currentStateHistoryValue);
+  }
+  resultsMessage = '';
+  componentDidMount = () => {
+     console.log('[HistoryQuery.jsx] componentDidMount props available are', JSON.stringify(this.props));
+     if(INVLIST.isHistoryEnabled){
+        this.getCurrentStateCall(this.getSettings());
+     }
+  };
+
+  componentWillUnmount  = () => {
+    console.log('[History.jsx] componentWillUnMount');
+  }
+  beforefetchInventoryData = (param) => {
+    if (param) {
+      this.setState({});
+    } else {
+      this.fetchInventoryData();
+    }
+  };
+  initState = () =>{
+              this.setState({
+                    totalResults: 0,
+                    enableBusyRecentFeedback: true,
+                    enableBusyHistoryStateFeedback: true,
+                    enableBusyDiffFeedback: true,
+                    data: [],
+                    nodes: [],
+                    payload : ((this.props.match.params.type == 'cq') ? atob(this.props.match.params.payloadEnc) : { "dsl" : atob(this.props.match.params.payloadEnc)}),
+                    topologyHistoryState: null,
+                    topologyCurrentState: null,
+                    stepEpochStateTime: 1000,
+                    maxEpochStartTime: Math.round(new Date().getTime()),
+                    minEpochStartTime: parseInt(this.props.match.params.epochTime) - 259200000,
+                    nodeDiff: null,
+                    queryDisplay: ((this.props.match.params.type == 'cq') ?  JSON.parse(atob(this.props.match.params.payloadEnc)).query : atob(this.props.match.params.payloadEnc)),
+                    currentGraphNodes: [],
+                    currentGraphLinks: [],
+                    historicGraphNodes: [],
+                    historicGraphLinks: [],
+                    selectedNodeHistoryState: null,
+                    selectedNodeCurrentState: null,
+                    showNodeModal: false,
+                    showTopologyDiffModal: false,
+                    nodeDisplay: '',
+                    totalDiff: null,
+                    showSlider: false,
+                    sliderTickArray: null,
+                    rawMappedCurrentState: null,
+                    rawMappedHistoricState: null,
+                    showTicks: INVLIST.showTicks,
+                    diffOverlayOn: false,
+                    currentErrMsg: null,
+                    historicErrMsg: null
+                  });
+  }
+  getSettings = () => {
+    const settings = {
+          'NODESERVER': INVLIST.NODESERVER,
+          'PROXY': INVLIST.PROXY,
+          'PREFIX': INVLIST.PREFIX,
+          'VERSION': INVLIST.VERSION,
+          'USESTUBS': INVLIST.useStubs
+        };
+    return settings;
+  }
+  fetchInventoryData = (param) => {
+    console.log('fetchInventoryData', param);
+  };
+
+  generateDiffArray = (arr) => {
+    let tempArray = {};
+    tempArray['properties'] = [];
+    tempArray['related-to'] = [];
+
+    for (var i = 0; i < arr.properties.length; i++ ){
+        if(arr.properties[i].key !== "length"){
+            tempArray['properties'][arr.properties[i].key] = arr.properties[i];
+        }else{
+            tempArray['properties']["LENGTH"] = arr.properties[i];
+        }
+    }
+    for (var j = 0; j < arr['related-to'].length; j++ ){
+        tempArray['related-to'][arr['related-to'][j].url] = arr['related-to'][j];
+    }
+    return tempArray;
+  }
+
+  getCurrentStateCall = (settings,url,param) =>{
+      let path = "";
+      let stubPath = "";
+      if(this.props.match.params.type == 'cq'){
+        path = 'query';
+        stubPath = 'currentCQState';
+      }else{
+        path = 'dsl';
+        stubPath = "currentBYOQState";
+      }
+      this.setState({currentErrMsg:null});
+      commonApi(settings, path + '?format=state', 'PUT', this.state.payload, stubPath, null, 'history-traversal')
+      .then(res => {
+        this.getHistoryStateCall(this.getSettings());
+        Visualization.chart('currentState', this.state.currentGraphNodes, this.state.currentGraphLinks, res.data, this);
+        this.setState(
+        {
+          topologyCurrentState : res.data,
+          enableBusyRecentFeedback: false
+        });
+        console.log('After recent node service call ......',this.state);
+        console.log('[HistoryQuery.jsx] recent node results : ',  res.data);
+      }, error=>{
+       	this.triggerError(error, "current");
+      }).catch(error => {
+        this.triggerError(error, "current");
+      });
+  };
+  triggerError = (error, type) => {
+    console.error('[HistoryQuery.jsx] error : ', JSON.stringify(error));
+  	let errMsg = '';
+  	if (error.response) {
+  		// The request was made and the server responded with a status code
+  		// that falls out of the range of 2xx
+  		console.log(error.response.data);
+  		console.log(error.response.status);
+  		console.log(error.response.headers);
+  		if(error.response.status){
+  		    errMsg += " Code: " + error.response.status;
+  		}
+  		if(error.response.data){
+            errMsg += " - " + JSON.stringify(error.response.data);
+        }
+  	} else if (error.request) {
+  		// The request was made but no response was received
+  		// `error.request` is an instance of XMLHttpRequest in the browser and an instance of
+  		// http.ClientRequest in node.js
+  		console.log(error.request);
+  		errMsg += " - Request was made but no response received";
+  	} else {
+  		// Something happened in setting up the request that triggered an Error
+  		console.log('Error', error.message);
+  		errMsg += " - Unknown error occurred " + error.message;
+  	}
+  	//Suppress 404's because that is just no results
+  	if(error.response && error.response.status === 404){
+       errMsg = '';
+    }
+  	if(type === 'current'){
+  	     this.setState({
+                  topologyCurrentState : null,
+                  currentErrMsg: errMsg,
+                  enableBusyRecentFeedback:false
+                });
+  	}else if (type === 'historic'){
+  	     if(this.state.isPlaying){
+  	         this.setState({
+  	                isPlaying: false,
+                    isStopped: true,
+                    isPaused: false });
+  	     }else{
+  	        this.setState({
+                 topologyHistoryState : null,
+                 nodeDiff: null,
+                 enableBusyDiffFeedback: false,
+                 enableBusyHistoryStateFeedback:false,
+                 historicErrMsg: errMsg
+               });
+         }
+  	}else{
+  	    console.log('[HistoryQuery.jsx] tiggerError method called without a type.' );
+  	}
+  }
+  getHistoryStateCall = (settings, url, param, timeStamp) =>{
+      let path = "";
+      let stubPath = "";
+      let stubChangesPath = "";
+      if(this.props.match.params.type == 'cq'){
+        path = 'query';
+        stubPath = 'historicalCQState';
+        stubChangesPath = 'historicalCQChanges';
+      }else{
+        path = 'dsl';
+        stubPath = 'historicalBYOQState';
+        stubChangesPath = 'historicalBYOQChanges';
+      }
+      let ts = this.state.currentStateHistoryValue;
+      if(timeStamp){
+        ts = parseInt(timeStamp);
+      }
+      this.setState({historicErrMsg:null});
+      commonApi(settings, path + "?format=state" + "&startTs=" + ts + "&endTs=" + ts, 'PUT', this.state.payload, stubPath, null, 'history-traversal')
+      .then(res => {
+        Visualization.chart('historicState', this.state.historicGraphNodes, this.state.historicGraphLinks, res.data, this);
+        this.setState(
+        {
+          topologyHistoryState :  res.data,
+          enableBusyHistoryStateFeedback: false
+        });
+        console.log('After historical node state service call ......',this.state);
+        console.log('[HistoryQuery.jsx] historical node state results : ',  res.data);
+        if(this.state.topologyHistoryState != null && this.state.topologyCurrentState != null){
+                    let topologyDiffHistoryArr = [];
+                    let topologyDiffCurrentArr = [];
+                    let tempNodeCurrentState = [];
+                    let tempNodeHistoricState = [];
+                    for( var i = 0; i < this.state.topologyHistoryState.results.length; i++ ){
+                        topologyDiffHistoryArr[this.state.topologyHistoryState.results[i].url] = this.generateDiffArray(this.state.topologyHistoryState.results[i]);
+                        tempNodeHistoricState[this.state.topologyHistoryState.results[i].url] = this.state.topologyHistoryState.results[i];
+                    }
+                    for( var j = 0; j < this.state.topologyCurrentState.results.length; j++ ){
+                        topologyDiffCurrentArr[this.state.topologyCurrentState.results[j].url] = this.generateDiffArray(this.state.topologyCurrentState.results[j]);
+                        tempNodeCurrentState[this.state.topologyCurrentState.results[j].url] = this.state.topologyCurrentState.results[j];
+                    }
+                    var result = deepDiffMapper.map(topologyDiffHistoryArr, topologyDiffCurrentArr);
+                    console.log("diff map" + result);
+                    this.setState({ totalDiff: result, enableBusyDiffFeedback: false, rawMappedCurrentState: tempNodeCurrentState, rawMappedHistoricState: tempNodeHistoricState});
+                }else{
+                    this.setState({ enableBusyDiffFeedback: false });
+         }
+      }, error=>{
+       	this.triggerError(error, "historic");
+      }).catch(error => {
+        this.triggerError(error, "historic");
+      });
+      if(this.state.showTicks){
+            commonApi(settings, path + "?format=changes", 'PUT', this.state.payload, stubChangesPath, null, 'history-traversal')
+                                    .then(res => {
+                                      let tickTempArray = [];
+                                      for(var j = 0; j <  res.data.results.length; j++ ){
+                                          for(var k = 0; k < res.data.results[j].changes.length; k++){
+                                              if(!tickTempArray.includes(res.data.results[j].changes[k])){
+                                                  tickTempArray.push(res.data.results[j].changes[k]);
+                                              }
+                                          }
+                                      }
+                                let tickArray = tickTempArray.sort(function(a, b) {
+                                                                                       var compareA = a;
+                                                                                       var compareB = b;
+                                                                                       if(compareA < compareB) return -1;
+                                                                                       if(compareA > compareB) return 1;
+                                                                                       return 0;
+                                                                                      });
+                                console.log("tick array: " + tickArray);
+                                this.setState({showSlider:true, sliderTickArray: tickArray});
+                             }).catch(error => {
+                               console.log('[HistoryQuery.jsx] historical node changes error : ', error);
+                               this.setState({showSlider:false});
+                        });
+      }else{
+            this.setState({showSlider:true});
+      }
+  };
+
+componentWillReceiveProps(nextProps) {
+    console.log('[History.jsx] componentWillReceiveProps');
+    console.log('[History.jsx] next payloadEnc:', atob(nextProps.match.params.payloadEnc));
+    console.log('[History.jsx] this payloadEnc:', atob(this.props.match.params.payloadEnc));
+
+    if (nextProps.match.params.payloadEnc
+            && nextProps.match.params.type
+            && nextProps.match.params.epochTime
+            && ((nextProps.match.params.payloadEnc !== this.props.match.params.payloadEnc) ||
+                (nextProps.match.params.type !== this.props.match.params.type) ||
+                (nextProps.match.params.epochTime !== this.props.match.params.epochTime))
+    ) {
+      this.props = nextProps;
+      this.initState();
+      this.getCurrentStateCall(this.getSettings());
+    }
+  };
+
+  handlePageChange = (pageNumber) => {
+    console.log('[History.jsx] HandelPageChange active page is', pageNumber);
+    this.setState({});
+  };
+
+  stateHistoryFormat = (event) =>{
+     this.setState({ currentStateHistoryValue: event.target.value, selectedHistoryStateFormatted: moment(event.target.value).format('dddd, MMMM Do, YYYY h:mm:ss A')});
+  };
+
+  changeHistoryState = () =>{
+    console.log('minEpochStateTime: ' + this.state.minEpochStateTime);
+    console.log('maxEpochStartTime: ' + this.state.maxEpochStartTime);
+    console.log('stepEpochStateTime: ' + this.state.stepEpochStateTime);
+    console.log('currentStateHistoryValue: ' + this.state.currentStateHistoryValue);
+    console.log("Calling the route again with a new timestamp");
+    this.props.history.push('/historyQuery/'  + this.props.match.params.type + '/' + this.props.match.params.payloadEnc + '/' + this.state.currentStateHistoryValue);
+  }
+
+  viewTopologyComp = () =>{
+    this.setState({
+        	showTopologyDiffModal: true
+    });
+  }
+
+  resetGraph = () =>{
+        Visualization.chart('currentState', this.state.currentGraphNodes, this.state.currentGraphLinks, this.state.topologyCurrentState, this);
+        Visualization.chart('historicState', this.state.historicGraphNodes, this.state.historicGraphLinks, this.state.topologyHistoryState, this);
+  }
+
+  addOverlay = (elementType, key, modificationType) =>{
+    let chartToOverlay = 'currentState';
+    let color = '';
+    let modIcon = '';
+    if (modificationType === "deleted"){
+        chartToOverlay = "historicState";
+    }
+    switch (modificationType){
+        case 'deleted':
+            color = 'red';
+            modIcon = '-';
+            break;
+        case 'created':
+            color = 'green';
+            modIcon = '+';
+            break;
+        case 'modified':
+            color = 'orange';
+            modIcon = '*';
+            break;
+        default:
+            console.log("hit default " + modificationType);
+    }
+    if(key){
+        key = (((decodeURIComponent(key)).replace(new RegExp('\/', 'g'),'-')).replace(new RegExp(':', 'g'),'-')).replace(new RegExp('\\.', 'g'),'-');
+    }else{
+        key='';
+    }
+    console.log("adding overlay item for - element type: " + elementType + " key: " + key + " modificationType: " + modificationType );
+    let elementKey = elementType + chartToOverlay + key;
+    let element = d3.select("#" + elementKey);
+
+    if(elementType === "line"){
+        element.attrs({ 'stroke': color, 'stroke-opacity': .6, 'stroke-width': '3px'});
+    }
+    if(elementType === "nodeIcon"){
+        element.classed("nodeIcon-" + modificationType, true);
+        let elementKeyNode = 'node' + chartToOverlay + key;
+        let elementNode = d3.select("#" + elementKeyNode);
+        elementNode.append("text")
+                         .attr("dy", 10)
+                         .attr("dx", 35)
+                         .attr('font-size', 25)
+                         .text(modIcon);
+    }
+    //Need to also add to historicGraph for modifications in addition to current
+    if(modificationType === 'modified'){
+       let elementKeyMod = elementType + 'historicState' + key;
+       let elementMod = d3.select("#" + elementKeyMod);
+       elementMod.classed("nodeIcon-" + modificationType, true);
+
+       let elementKeyModNode =  'nodehistoricState' + key;
+       let elementModNode = d3.select("#" + elementKeyModNode);
+       elementModNode.append("text")
+                        .attr("dy", 10)
+                        .attr("dx", 35)
+                        .attr('font-size', 25)
+                        .text(modIcon);
+    }
+  }
+
+  viewTopologyCompVisual = () =>{
+    if(this.state.diffOverlayOn){
+        this.setState({ diffOverlayOn: false});
+        this.resetGraph();
+    }else if(this.state.totalDiff){
+        this.setState({ diffOverlayOn: true});
+        const properties =  Object.entries(this.state.totalDiff).forEach((prop) => {
+            if (prop){
+                        let propWorkaround = prop;
+                        if(prop.data){
+                            propWorkaround = prop.data;
+                        }
+                        let tempProp = propWorkaround[1];
+                        let attributeProperties = '';
+                        let relationships = '';
+                        let topLevelType = tempProp.type;
+                        let alreadyHighlighted = false;
+                        if(topLevelType){
+                            this.addOverlay('nodeIcon', propWorkaround[0], topLevelType);
+                            //set this to not mark as modified when it is added new
+                            alreadyHighlighted = true;
+                        }
+                        if(!topLevelType && tempProp.properties){
+                            for (var key in tempProp.properties) {
+                                    if (tempProp.properties.hasOwnProperty(key)) {
+                                       let property = tempProp.properties[key];
+                                       if(property && ((property.value && property.value.type !== 'unchanged') || property.type)){
+                                         this.addOverlay('nodeIcon', propWorkaround[0], 'modified');
+                                         break;
+                                       }
+                                    }
+                            }
+                        }
+                        if(tempProp['related-to'] || tempProp.data['related-to']){
+                            let rel = null;
+                            let topLevelType = null;
+                            if(tempProp['related-to']){
+                                rel = tempProp['related-to'];
+                            }else if (tempProp.data['related-to']) {
+                                rel = tempProp.data['related-to'];
+                                topLevelType = tempProp.type;
+                            }
+                            relationships =  Object.entries(rel).forEach((property) => {
+                                    let relationProp = property[1];
+                                    if(relationProp && relationProp.type && relationProp.type.type &&  relationProp.type.type !== "unchanged"){
+                                        //do nothing since we only care about additions and deletions on relationships, should not be considered modified
+                                        console.log("relationship considered modified: id: " + relationProp.id + " type: "+ relationProp.type + " mod type: " + relationProp.type.type)
+                                    }else if(relationProp && relationProp.type && !relationProp.type.type && relationProp.url && relationProp.url.data){
+                                        if(!alreadyHighlighted){
+                                            this.addOverlay('nodeIcon', propWorkaround[0], 'modified');
+                                        }
+                                        this.addOverlay('line', relationProp.id.data, relationProp.type);
+                                    }else if (relationProp && relationProp.type && relationProp.data){
+                                        if(!alreadyHighlighted){
+                                            this.addOverlay('nodeIcon', propWorkaround[0], 'modified');
+                                        }
+                                        this.addOverlay('line', relationProp.data.id, relationProp.type);
+                                    }else if (topLevelType){
+                                        if(!alreadyHighlighted){
+                                            this.addOverlay('nodeIcon', propWorkaround[0], 'modified');
+                                        }
+                                        this.addOverlay('line', relationProp.id, topLevelType);
+                                    }
+                            });
+                        }
+                  }else{
+                      //No changes, do nothing
+                  }
+            });
+
+      }else{
+        // do nothing if no diff
+      }
+  }
+
+  closeTopologyDiffModal = () => {
+    this.setState({
+    	showTopologyDiffModal: false
+    });
+  }
+  openNodeModal(nodeDisplay, nodeUri, nodeType){ // open modal
+                 console.log('history >> showModal');
+                 this.setState({ nodeDiff: this.state.totalDiff[nodeUri]});
+                 nodeDisplay = "State Comparison of " + nodeUri;
+                 if(!this.state.rawMappedHistoricState[nodeUri]){
+                    this.state.rawMappedHistoricState[nodeUri] = {};
+                 }
+                 if(!this.state.rawMappedCurrentState[nodeUri]){
+                    this.state.rawMappedCurrentState[nodeUri] = {};
+                 }
+                 this.state.rawMappedHistoricState[nodeUri].primaryHeader = "Historic State of " + nodeDisplay;
+                 this.state.rawMappedCurrentState[nodeUri].primaryHeader = "Current State of " + nodeDisplay;
+                 if(nodeDisplay){
+                    this.setState({
+                       nodeDisplay: nodeDisplay,
+                       selectedNodeHistoryState: this.state.rawMappedHistoricState[nodeUri],
+                       selectedNodeCurrentState: this.state.rawMappedCurrentState[nodeUri],
+                       focusedNodeUri: nodeUri,
+                       focusedNodeType: nodeType,
+                       showNodeModal:true
+                    });
+                 }else{
+                     this.setState({
+                     showNodeModal:true
+                     });
+                 }
+  }
+  closeNodeModal = () => {
+    this.setState({
+    	showNodeModal: false
+    });
+  }
+
+  getStateIndex = () =>{
+    return this.state.sliderTickArray.indexOf(this.state.currentStateHistoryValue);
+  }
+
+  navigateAnimation = (index, command) => {
+     if(!command){
+        this.setState({isPlaying:false, isStopped: false, isPaused: true, currentStateHistoryValue: this.state.sliderTickArray[index], selectedHistoryStateFormatted: moment(this.state.sliderTickArray[index]).format('dddd, MMMM Do, YYYY h:mm:ss A')});
+     }else if (command === 'play'){
+        this.setState({currentStateHistoryValue: this.state.sliderTickArray[index], selectedHistoryStateFormatted: moment(this.state.sliderTickArray[index]).format('dddd, MMMM Do, YYYY h:mm:ss A')});
+     }
+     this.props.history.push('/historyQuery/'  + this.props.match.params.type + '/' + this.props.match.params.payloadEnc + '/' + this.state.sliderTickArray[index]);
+  }
+
+  play = () =>{
+    if(this.state.isPlaying){
+        if(!this.state.enableBusyHistoryStateFeedback){
+            var index = Math.min(this.state.sliderTickArray.length - 1, this.getStateIndex() + 1);
+            if(this.state.sliderTickArray.length > this.getStateIndex() + 1){
+                    this.navigateAnimation(this.getStateIndex() + 1, 'play');
+
+            }else{
+                 this.setState({isPlaying:false, isStopped: true, isPaused: false});
+            }
+        }
+    }else{
+         clearInterval(this.state.intervalId);
+    }
+  }
+
+  animationControl = (controlType) => {
+    console.log("Control was hit: " + controlType);
+    switch(controlType){
+        case 'play':
+            if(!this.state.isPlaying){
+                this.setState({isPlaying:true, isStopped: false, isPaused: false, intervalId: setInterval(this.play, INVLIST.animationIntervalMs)});
+            }
+            break;
+        case 'pause':
+            if(this.state.isPlaying){
+                clearInterval(this.state.intervalId);
+                this.setState({isPlaying:false, isPaused: true});
+            }
+            break;
+        case 'stop':
+            if(this.state.isPlaying || this.state.isPaused){
+                clearInterval(this.state.intervalId);
+                this.setState({isPlaying:false, isStopped: true, isPaused: false});
+            }
+            break;
+        case 'skipForwardStep':
+            var index = Math.min(this.state.sliderTickArray.length - 1, this.getStateIndex() + 1);
+            this.navigateAnimation(index);
+            break;
+        case 'skipBackwardStep':
+            var index = Math.max(0, this.getStateIndex() - 1);
+            this.navigateAnimation(index);
+            break;
+        case 'skipForwardLast':
+            this.navigateAnimation(this.state.sliderTickArray.length - 1);
+            break;
+        case 'skipBackwardEpoch':
+            this.navigateAnimation(0);
+            break;
+        default:
+            this.setState({isPlaying:false, isStopped: false, isPaused: false});
+            break;
+    }
+  }
+  // START: These functions are for the animation controls
+  setHistoricStateValues = (currValue) =>{
+    this.setState({currentStateHistoryValue: currValue, selectedHistoryStateFormatted: moment(currValue).format('dddd, MMMM Do, YYYY h:mm:ss A')});
+  }
+
+  navigateHistory = (time) =>{
+    this.props.history.push('/historyQuery/'  + this.props.match.params.type + '/' + this.props.match.params.payloadEnc + '/' + time);
+  }
+
+  setStateValue = (key, value) =>{
+     this.setState((state) => { key : value });
+  }
+  getStateValue = (stateVar) => {
+    return this.state[stateVar];
+  }
+  clear = (interval) =>{
+    clearInterval(interval);
+  }
+  // END
+
+  render() {
+        if(INVLIST.isHistoryEnabled){
+            return (
+               <div>
+                <header className='addPadding jumbotron my-4'>
+                            <h1 className='display-2'>History Visualization</h1>
+                            <p className='lead'>
+                              On this page you have the ability to view a series of network elements in their current and historic state.
+                              Zooming and panning are enabled in the graphs. You can use the scrollwheel to zoom and click+drag to pan.
+                              If a node is single clicked you can drag the elements to reposition them. Double-clicking a node will
+                              show the comparison between the two nodes in a pop-up modal. Animation controls are provided to seemlessly transition between states.
+                              You can view the graph difference in a visual form by clicking View Visual Comparison.
+                            </p>
+                </header>
+                <Grid fluid={true} className="addPadding">
+                  <Row className={this.state.currentErrMsg ? 'show' : 'hidden'} >
+                    <div className='addPaddingTop alert alert-danger' role="alert">
+                        An error occurred while trying to get current information, please try again later. If this issue persists, please contact the system administrator. {this.state.currentErrMsg}
+                    </div>
+                  </Row>
+                  <Row className={!this.state.currentErrMsg ? 'show' : 'hidden'} >
+                    <Col className='col-lg-12'>
+                          <div className='card d3-history-query-card'>
+                            <div className='card-header history-query-card-header'>
+                              <h2><strong>Current State</strong> of <em>{this.state.queryDisplay}</em></h2>
+                            </div>
+                            <div className={'card-header ' + (this.state.topologyHistoryState ? '' : 'hidden')}>
+                                 <button type='button' className='btn btn-outline-primary' onClick={this.viewTopologyCompVisual}>Toggle Visual Comparison</button>
+                            </div>
+                            <div className='history-query-card-content'>
+                               {!this.state.topologyCurrentState || (this.state.topologyCurrentState.results && this.state.topologyCurrentState.results.length === 0) && (<div className='addPaddingTop'><p>No current state for this query</p></div>)}
+                               <OutputVisualization identifier="currentState" width={this.svgWidth}  height="600" overflow="scroll"/>
+                            </div>
+                            <div className='card-footer'>
+                               <strong>Tip:</strong> <em>Click and drag network elements to reposition them, double-click nodes to see the node detail comparison. In addition: The graph supports pinch zoom or scrollwheel for zooming. Panning can be done by single-click and drag.</em>
+                            </div>
+                          </div>
+                    </Col>
+                  </Row>
+                  <Row className={this.state.historicErrMsg ? 'show' : 'hidden'} >
+                    <div className='addPaddingTop alert alert-danger' role="alert">
+                       An error occurred, while trying to get historic information, please try again later. If this issue persists, please contact the system administrator. {this.state.historicErrMsg}
+                    </div>
+                  </Row>
+                   <Row className={!this.state.historicErrMsg ? 'show' : 'hidden'}>
+                        <Col className='col-lg-12'>
+                              <div className='card d3-history-query-card'>
+                                <div className='card-header history-query-card-header'>
+                                  <h2><strong>Historical State</strong> of <em>{this.state.queryDisplay}</em> at {moment(parseInt(this.props.match.params.epochTime)).format('dddd, MMMM Do, YYYY h:mm:ss A')}</h2>
+                                </div>
+                                    <div className='card-header'>
+                                       { (this.state.showSlider && this.state.showTicks) && (<Row className='show-grid'>
+                                                                                                <Col md={3}>
+                                                                                                    <ReactBootstrapSlider
+                                                                                                    value={this.state.currentStateHistoryValue}
+                                                                                                    change={this.stateHistoryFormat}
+                                                                                                    slideStop={this.stateHistoryFormat}
+                                                                                                    step={ 1 }
+                                                                                                    ticks={ this.state.sliderTickArray }
+                                                                                                    ticks_snap_bounds={ 10000 }
+                                                                                                    orientation="horizontal" />
+                                                                                                </Col>
+                                                                                                <Col md={8}>
+                                                                                                    <i className='icon-controls-skipbackstartover animationControlIcon'  onClick={() => this.animationControl('skipBackwardEpoch')} role="img"></i>
+                                                                                                    <i className='icon-controls-rewind animationControlIcon'  onClick={() => this.animationControl('skipBackwardStep')} role="img"></i>
+                                                                                                    <i className={'icon-controls-pointer ' + (this.state.isPlaying ? 'animationPlayingIcon' : 'animationControlIcon')}  onClick={() => this.animationControl('play')} role="img"></i>
+                                                                                                    <i className={'icon-controls-pause ' + (this.state.isPaused ? 'animationPausedIcon' : 'animationControlIcon')}  onClick={() => this.animationControl('pause')} role="img"></i>
+                                                                                                    <i className={'icon-controls-stop ' + (this.state.isStopped ? 'animationStoppedIcon' : 'animationControlIcon')}   onClick={() => this.animationControl('stop')} role="img"></i>
+                                                                                                    <i className='icon-controls-fastforward animationControlIcon'  onClick={() => this.animationControl('skipForwardStep')} role="img"></i>
+                                                                                                    <i className='icon-controls-skipforward animationControlIcon'  onClick={() => this.animationControl('skipForwardLast')} role="img"></i>
+                                                                                                </Col>
+                                                                                               </Row>
+                                                                                                      )}
+                                       { (this.state.showSlider && !this.state.showTicks) && (<ReactBootstrapSlider
+                                                                                                value={this.state.currentStateHistoryValue}
+                                                                                                change={this.stateHistoryFormat}
+                                                                                                slideStop={this.stateHistoryFormat}
+                                                                                                step={this.state.stepEpochStateTime}
+                                                                                                max={this.state.maxEpochStartTime}
+                                                                                                min={this.state.minEpochStartTime}
+                                                                                                orientation="horizontal" />)}
+
+                                                                    <p>{this.state.selectedHistoryStateFormatted}</p>
+                                                                    <button type='button' className='btn btn-outline-primary' onClick={this.changeHistoryState}>Refresh</button>
+                                    </div>
+                                    <div className='history-query-card-content' >
+                                      {!this.state.topologyHistoryState || (this.state.topologyHistoryState.results && this.state.topologyHistoryState.results.length  === 0) && (<div className="addPaddingTop"><p>No state during this time period</p></div>)}
+                                      <OutputVisualization identifier="historicState" width={this.svgWidth}  height="600" overflow="scroll"/>
+                                    </div>
+                                    <div className={'card-footer ' + (this.state.topologyHistoryState ? '' : 'hidden')}>
+                                      <strong>Tip:</strong> <em>Click and drag network elements to reposition them, double-click nodes to see the node detail comparison. In addition: The graph supports pinch zoom or scrollwheel for zooming. Panning can be done by single-click and drag.</em>
+                                    </div>
+                                </div>
+
+                        </Col>
+                   </Row>
+                </Grid>
+                <div className='static-modal'>
+                          		<Modal show={this.state.showNodeModal} onHide={this.closeNodeModal} dialogClassName="modal-override">
+                          			<Modal.Header>
+                          				<Modal.Title>Retrieve {this.state.nodeDisplay} History</Modal.Title>
+                          			</Modal.Header>
+                          			<Modal.Body>
+                                        <Grid fluid={true}>
+                                              <Row className='show-grid'>
+                                                <Col md={4}>
+                                                    <HistoryCard node={this.state.selectedNodeHistoryState}/>
+                                                </Col>
+                                                <NodeDiffCard diff={this.state.nodeDiff}/>
+                                                <Col md={4}>
+                                                    <HistoryCard node={this.state.selectedNodeCurrentState}/>
+                                                </Col>
+                                              </Row>
+                                        </Grid>
+                          			</Modal.Body>
+                          			<Modal.Footer>
+                          				<Button onClick={this.closeNodeModal}>Close</Button>
+                          			</Modal.Footer>
+                          		</Modal>
+                </div>
+                <div className='static-modal'>
+                                  		<Modal show={this.state.showTopologyDiffModal} onHide={this.closeTopologyDiffModal}>
+                                  			<Modal.Header>
+                                  				<Modal.Title>Retrieve Topology History</Modal.Title>
+                                  			</Modal.Header>
+                                  			<Modal.Body>
+                                                <Grid fluid={true}>
+                                                      <Row className='show-grid'>
+                                                        <Col md={12}>
+                                                            <TopologyDiffCard node={this.state.totalDiff}/>
+                                                        </Col>
+                                                      </Row>
+                                                </Grid>
+                                  			</Modal.Body>
+                                  			<Modal.Footer>
+                                  				<Button onClick={this.closeTopologyDiffModal}>Close</Button>
+                                  			</Modal.Footer>
+                                  		</Modal>
+                        </div>
+              </div>
+            );
+        }else{
+            return(<p>History Not Enabled for this instance, please check config.</p>)
+        }
+  }
+}
+
+export default HistoryQuery;
diff --git a/src/app/model/history/HistoryReducer.js b/src/app/model/history/HistoryReducer.js
new file mode 100644
index 0000000..27456ec
--- /dev/null
+++ b/src/app/model/history/HistoryReducer.js
@@ -0,0 +1,43 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import {HistoryConstants} from './HistoryConstants';
+
+const initalState = {
+  inventoryData: []
+};
+
+export default (state = initalState, action) => {
+  switch (action.type) {
+    case(HistoryConstants.UPDATE_INVENTORY_DATA):
+      console.log('[HistoryReducer] action.data:', action.data);
+      return {
+        ...state,
+        inventoryData: action.data
+      };
+    default:
+      return {
+        ...state
+      };
+  }
+
+};
+
+
diff --git a/src/app/model/history/components/AnimationControls.jsx b/src/app/model/history/components/AnimationControls.jsx
new file mode 100644
index 0000000..3f1eb92
--- /dev/null
+++ b/src/app/model/history/components/AnimationControls.jsx
@@ -0,0 +1,126 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
+import Col from 'react-bootstrap/lib/Col';
+
+class AnimationControls extends Component {
+  constructor(props){
+      console.log(props);
+      super(props);
+      this.props = props;
+  }
+
+  getIndex = () =>{
+      return (this.props.get('sliderTickArray')).indexOf(this.props.get('currentStateHistoryValue'));
+  }
+
+  navigateAnimation = (index, command) => {
+     if(!command){
+        this.props.set('isPlaying',false);
+        this.props.set('isStopped', false);
+        this.props.set('isPaused', true);
+        this.props.setValueState((this.props.get('sliderTickArray'))[index]);
+     }else if (command === 'play'){
+        this.props.setValueState((this.props.get('sliderTickArray'))[index]);
+     }
+     this.props.setNavigate((this.props.get('sliderTickArray'))[index]);
+  }
+
+  play = () =>{
+    if(this.props.get('isPlaying')){
+        var index = Math.min((this.props.get('sliderTickArray')).length - 1, this.getIndex() + 1);
+        this.navigateAnimation(this.getIndex() + 1, 'play');
+        if(index === (this.props.get('sliderTickArray')).length - 1){
+            this.props.set('isPlaying', false);
+            this.props.set('isStopped', true);
+            this.props.set('isPaused', false);
+        }
+    }else{
+         this.props.clear(this.props.get('intervalId'));
+    }
+  }
+
+  animationControl = (controlType) => {
+    console.log("Control was hit: " + controlType);
+    switch(controlType){
+        case 'play':
+            if(!this.props.get('isPlaying')){
+                if(!this.props.get('intervalId')){
+                    this.props.set('intervalId', setInterval(this.play, 10000));
+                }
+                this.props.set('isPlaying', true);
+                this.props.set('isStopped', false);
+                this.props.set('isPaused', false);
+            }
+            break;
+        case 'pause':
+            if(this.props.get('isPlaying')){
+                this.props.clear(this.props.get('intervalId'));
+                this.props.set('isPlaying', false);
+                this.props.set('isPaused', true);
+            }
+            break;
+        case 'stop':
+            if(this.props.get('isPlaying') || this.props.get('isPaused')){
+                this.props.clear(this.props.get('intervalId'));
+                this.props.set('isPlaying', false);
+                this.props.set('isStopped', true);
+                this.props.set('isPaused', false);
+            }
+            break;
+        case 'skipForwardStep':
+            var index = Math.min((this.props.get('sliderTickArray')).length - 1, this.getIndex() + 1);
+            this.navigateAnimation(index);
+            break;
+        case 'skipBackwardStep':
+            var index = Math.max(0, this.getIndex() - 1);
+            this.navigateAnimation(index);
+            break;
+        case 'skipForwardLast':
+            this.navigateAnimation((this.props.get('sliderTickArray')).length - 1);
+            break;
+        case 'skipBackwardEpoch':
+            this.navigateAnimation(0);
+            break;
+        default:
+            this.props.set('isPlaying', false);
+            this.props.set('isStopped', false);
+            this.props.set('isPaused', false);
+            break;
+    }
+  }
+  render(){
+    return (
+     <Col md={8}>
+       <i className='icon-controls-skipbackstartover animationControlIcon'  onClick={() => this.animationControl('skipBackwardEpoch')} role="img"></i>
+       <i className='icon-controls-rewind animationControlIcon'  onClick={() => this.animationControl('skipBackwardStep')} role="img"></i>
+       { !this.props.playControlsDisabled && (<span><i className={'icon-controls-pointer ' + (this.props.get('isPlaying') ? 'animationPlayingIcon' : 'animationControlIcon')}  onClick={() => this.animationControl('play')} role="img"></i>
+       <i className={'icon-controls-pause ' + (this.props.get('isPaused') ? 'animationPausedIcon' : 'animationControlIcon')}  onClick={() => this.animationControl('pause')} role="img"></i>
+       <i className={'icon-controls-stop ' + (this.props.get('isStopped') ? 'animationStoppedIcon' : 'animationControlIcon')}   onClick={() => this.animationControl('stop')} role="img"></i></span>)}
+       <i className='icon-controls-fastforward animationControlIcon'  onClick={() => this.animationControl('skipForwardStep')} role="img"></i>
+       <i className='icon-controls-skipforward animationControlIcon'  onClick={() => this.animationControl('skipForwardLast')} role="img"></i>
+     </Col>
+    );
+  }
+};
+
+export default AnimationControls;
diff --git a/src/app/model/history/components/HistoryCard.jsx b/src/app/model/history/components/HistoryCard.jsx
new file mode 100644
index 0000000..39d7f57
--- /dev/null
+++ b/src/app/model/history/components/HistoryCard.jsx
@@ -0,0 +1,101 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React from 'react';
+import moment from "moment";
+import Col from 'react-bootstrap/lib/Col';
+import Panel from 'react-bootstrap/lib/Panel';
+
+const historyCard = (props) => {
+  if(props && props.node && props.node.properties){
+    const properties = (props.node.properties).map((prop, idx) => {
+      return (
+        <Panel>
+          <Panel.Heading className="custom-accordion">
+             <Panel.Title toggle> <strong>{prop.key}</strong> : {'' + prop.value}</Panel.Title>
+          </Panel.Heading>
+          <Panel.Collapse>
+            <Panel.Body className='cardwrap'>
+              <p><strong>Last Updated By:</strong> {prop.sot}</p>
+              <p><strong>Last Updated (time):</strong> {moment(prop.timestamp).format('dddd, MMMM Do, YYYY h:mm:ss A')}</p>
+              <p><strong>Transaction Id:</strong> {(prop['tx-id']) ? prop['tx-id'] : 'N/A'}</p>
+            </Panel.Body>
+          </Panel.Collapse>
+        </Panel>
+      );
+    });
+
+    //TODO handle no relationships and no attributes
+
+    const relationships = (props.node['related-to']).map((prop, idx) => {
+        return (
+          <p key={idx}><strong>{prop['node-type']}:</strong> {prop.url} {prop['relationship-label']} (added by {prop.sot} on {moment(prop.timestamp).format('dddd, MMMM Do, YYYY h:mm:ss A')})</p>
+        );
+      });
+
+    return (
+      <Col className={""+(props.split ? 'col-lg-4' : 'col-lg-12')}>
+        <div className='card model-card'>
+          <div className='card-header'>
+            <h4 className='card-title'>{props.node.primaryHeader}</h4>
+          </div>
+          <div className='card-header'>
+            {props.node.secondaryHeader}
+          </div>
+          <div className='card-content model-card-content'>
+            {properties}
+          </div>
+          <div className='card-footer'>
+             <Panel>
+               <Panel.Heading>
+                 <Panel.Toggle>
+                   <button type='button' className='btn btn-outline-primary'>
+                     Relationships
+                     </button>
+                 </Panel.Toggle>
+               </Panel.Heading>
+               <Panel.Collapse>
+                 <Panel.Body className='cardwrap'>
+                   {relationships}
+                 </Panel.Body>
+               </Panel.Collapse>
+             </Panel>
+          </div>
+        </div>
+      </Col>
+    );
+  }else{
+    return(
+        <Col className={""+(props.split ? 'col-lg-4' : 'col-lg-12')}>
+                <div className='card model-card'>
+                  <div className='card-header'>
+                    <h4 className='card-title'>No State Found</h4>
+                  </div>
+                  <div className='card-content model-card-content'>
+                    No State was found at the provided timestamp. Please try another timestamp.
+                  </div>
+                </div>
+        </Col>
+    );
+  }
+};
+
+export default historyCard;
+
diff --git a/src/app/model/history/components/HistoryEntry.jsx b/src/app/model/history/components/HistoryEntry.jsx
new file mode 100644
index 0000000..7b1a297
--- /dev/null
+++ b/src/app/model/history/components/HistoryEntry.jsx
@@ -0,0 +1,55 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
+import Col from 'react-bootstrap/lib/Col';
+
+class HistoryEntry extends Component {
+  constructor(props){
+      console.log(props);
+      super(props);
+      this.props = props;
+  }
+
+  render(){
+   this.triggerState = () => {
+      this.props.triggerState(this.props.entryNodeId, this.props.entryEpoch);
+    }
+    return (
+              <a className={"list-group-item list-group-item-action flex-column align-items-start "+ (this.props.entryAction === 'Deleted' ? 'group-item-danger' : '')}
+                 onClick={this.triggerState}>
+                <div className='d-flex w-100 justify-content-between'>
+                  <h3 className="mb-1">{this.props.entryHeader}</h3>
+                  <h3 className="mb-1">{this.props.entryBody}</h3>
+                  <small>{this.props.entryDate}</small>
+                </div>
+                <div>
+                  <small>Modified by {this.props.entrySOT}</small>
+                </div>
+                <div>
+                  <small>Transaction Id : {this.props.entryTransId}</small>
+                </div>
+              </a>
+    );
+  }
+};
+
+export default HistoryEntry;
diff --git a/src/app/model/history/components/HistoryGallery.jsx b/src/app/model/history/components/HistoryGallery.jsx
new file mode 100644
index 0000000..0e4c011
--- /dev/null
+++ b/src/app/model/history/components/HistoryGallery.jsx
@@ -0,0 +1,65 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React from 'react';
+import Grid from 'react-bootstrap/lib/Grid';
+import Row from 'react-bootstrap/lib/Row';
+import HistoryEntry from './HistoryEntry.jsx';
+/**
+ * This function will take all of the node objects and turn them into
+ * a ui grid of HistoryCard components. This function is essentially a container
+ * for the HistoryCards
+ * @param props
+ * @returns {*}
+ */
+const HistoryGallery = (props) => {
+
+    let entries = null;
+    if (props.entries && props.entries.length > 0) {
+        entries = props.entries.map((entry, idx) => {
+        return (
+          <HistoryEntry
+            key={idx}
+            triggerState={props.triggerState}
+            entryKey={entry.key}
+            entryType={entry.type}
+            entryValue={entry.value}
+            entryBody= {entry.body}
+            entryHeader= {entry.header}
+            entrySOT={entry.sot}
+            entryAction= {entry.action}
+            entryEpoch= {entry.timeRank}
+            entryNodeId= {props.nodeId}
+            entryDate={entry.displayTimestamp}
+            entryTransId = {entry['tx-id']}/>
+        );
+      });
+    }else{
+        return (<p>No History</p>);
+    }
+
+    return (
+      <div className="list-group">
+        {entries}
+      </div>
+    );
+};
+
+export default HistoryGallery;
diff --git a/src/app/model/history/components/NodeDiffCard.jsx b/src/app/model/history/components/NodeDiffCard.jsx
new file mode 100644
index 0000000..2bc2a82
--- /dev/null
+++ b/src/app/model/history/components/NodeDiffCard.jsx
@@ -0,0 +1,106 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React from 'react';
+import moment from "moment";
+import Col from 'react-bootstrap/lib/Col';
+import Panel from 'react-bootstrap/lib/Panel';
+
+const nodeDiffCard = (props) => {
+  let showNoPropsMessage = true;
+  let showNoRelationshipsMessage = true;
+  if(props && props.diff && props.diff.properties){
+    const properties =  Object.entries(props.diff.properties).map((property, idx) => {
+      let prop = property[1];
+      if(prop && prop.value && prop.value.type !== 'unchanged'){
+        showNoPropsMessage = false;
+        return (
+          <div>
+              <p><strong>Attribute:</strong> {prop.key.data} ({prop.value.type})</p>
+          </div>
+        );
+      }else if (prop && prop.type){
+        showNoPropsMessage = false;
+         return (
+           <div>
+               <p><strong>Attribute:</strong> {prop.data.key} ({prop.type})</p>
+           </div>
+         );
+      }
+    });
+
+    //TODO handle no relationships and no attributes
+
+    const relationships =  Object.entries(props.diff['related-to']).map((property, idx) => {
+        let prop = property[1];
+        if(prop && prop.type && prop.type.type){
+            return ('');
+        }else if(prop && prop.type && !prop.data){
+            showNoRelationshipsMessage = false;
+            return (
+              <div>
+                <p><strong>Relationship</strong>: {prop['relationship-label'].data} {prop['node-type'].data} {prop.url.data} ({prop.type})</p>
+              </div>
+            );
+        }else if (prop && prop.type && prop.data){
+             showNoRelationshipsMessage = false;
+               return (
+                 <div>
+                   <p><strong>Relationship</strong>: {prop.data['relationship-label']} {prop.data['node-type']} {prop.data.url} ({prop.type})</p>
+                 </div>
+               );
+        }
+      });
+
+    return (
+      <Col className='col-lg-4'>
+        <div className='card model-card'>
+          <div className='card-header'>
+            <h4 className='card-title'>Changes from Historic to Current State</h4>
+          </div>
+          <div className='card-header'></div>
+          <div className='card-content model-card-content'>
+              {properties}
+              <div className={showNoPropsMessage ? 'show' : 'hidden'}><p><strong>No Attribute differences, current.</strong></p></div>
+              {relationships}
+              <div className={showNoRelationshipsMessage ? 'show' : 'hidden'}><p><strong>No Relationship differences, current.</strong></p></div>
+          </div>
+        </div>
+      </Col>
+    );
+  }else{
+    return(
+        <Col className='col-lg-4'>
+                <div className='card model-card'>
+                  <div className='card-header'>
+                    <h4 className='card-title'>Unable to pull diff</h4>
+                  </div>
+                  <div className='card-header'></div>
+                  <div className='card-content model-card-content'>
+                      Diff unable to be calculated currently, choose a different timeframe.
+                  </div>
+                </div>
+        </Col>
+    );
+  }
+};
+
+export default nodeDiffCard;
+
diff --git a/src/app/model/history/components/TopologyDiffCard.jsx b/src/app/model/history/components/TopologyDiffCard.jsx
new file mode 100644
index 0000000..9d49b17
--- /dev/null
+++ b/src/app/model/history/components/TopologyDiffCard.jsx
@@ -0,0 +1,151 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React from 'react';
+import moment from "moment";
+import Col from 'react-bootstrap/lib/Col';
+import Panel from 'react-bootstrap/lib/Panel';
+
+const topologyDiffCard = (props) => {
+  let showNoNodesMessage = true;
+  if(props && props.node){
+    const properties =  Object.entries(props.node).map((prop, idx) => {
+        if (prop){
+                    showNoNodesMessage = false;
+                    let showNoRelationshipsMessage = true;
+                    let showNoAttributesMessage = true;
+                    let propWorkaround = prop;
+                    if(prop.data){
+                        propWorkaround = prop.data;
+                    }
+                    let tempProp = propWorkaround[1];
+                    let attributeProperties = '';
+                    let relationships = '';
+                    if(tempProp.properties){
+                        attributeProperties =  Object.entries(tempProp.properties).map((property, idx) => {
+                          let attrProp = property[1];
+                          if(attrProp && attrProp.value && attrProp.value.type !== 'unchanged'){
+                            showNoAttributesMessage = false;
+                            return (
+                              <div>
+                                  <p><strong>Attribute:</strong> {attrProp.key.data} ({attrProp.value.type})</p>
+                              </div>
+                            );
+                          }else if (attrProp && attrProp.type){
+                             showNoAttributesMessage = false;
+                             return (
+                               <div>
+                                   <p><strong>Attribute:</strong> {attrProp.data.key} ({attrProp.type})</p>
+                               </div>
+                             );
+                          }
+                        });
+                    }
+                    if(tempProp['related-to'] || tempProp.data['related-to']){
+                        let rel = null;
+                        let topLevelType = null;
+                        if(tempProp['related-to']){
+                            rel = tempProp['related-to'];
+                        }else if (tempProp.data['related-to']) {
+                            rel = tempProp.data['related-to'];
+                            topLevelType = tempProp.type;
+                        }
+                        relationships =  Object.entries(rel).map((property, idx) => {
+                                let relationProp = property[1];
+                                if(relationProp && relationProp.type && relationProp.type.type &&  relationProp.type.type !== "unchanged"){
+                                    return ('');
+                                }else if(relationProp && relationProp.type && !relationProp.type.type && relationProp.url && relationProp.url.data){
+                                    showNoRelationshipsMessage = false;
+                                    return (
+                                      <div>
+                                        <p><strong>Relationship</strong>: {relationProp['relationship-label'].data} {relationProp['node-type'].data} {relationProp.url.data} ({relationProp.type})</p>
+                                      </div>
+                                    );
+                                }else if (relationProp && relationProp.type && relationProp.data){
+                                     showNoRelationshipsMessage = false;
+                                       return (
+                                         <div>
+                                           <p><strong>Relationship</strong>: {relationProp.data['relationship-label']} {relationProp.data['node-type']} {relationProp.data.url} ({relationProp.type})</p>
+                                         </div>
+                                       );
+                                }else if (topLevelType){
+                                    showNoRelationshipsMessage = false;
+                                    return (
+                                              <div>
+                                                <p><strong>Relationship</strong>: {relationProp['relationship-label']} {relationProp['node-type']} {relationProp.url} ({topLevelType})</p>
+                                              </div>
+                                            );
+                                }
+                        });
+                    }
+                       return (
+                             <Panel>
+                                <Panel.Heading className="custom-accordion">
+                                   <Panel.Title toggle><strong>Node:</strong> {prop[0]} <p className={tempProp.type ? 'show' : 'hidden'}>({tempProp.type})</p></Panel.Title>
+                                </Panel.Heading>
+                                <Panel.Collapse>
+                                  <Panel.Body className='cardwrap'>
+                                    {attributeProperties}
+                                    <div className={showNoAttributesMessage ? 'show' : 'hidden'}><p><strong>No Attribute differences, current.</strong></p></div>
+                                    {relationships}
+                                    <div className={showNoRelationshipsMessage ? 'show' : 'hidden'}><p><strong>No Relationship differences, current.</strong></p></div>
+                                  </Panel.Body>
+                                </Panel.Collapse>
+                             </Panel>
+                       );
+              }else{
+                  <div>
+                      <p><strong>Node changes in the topology states</strong></p>
+                  </div>
+              }
+        });
+
+    return (
+      <Col className='col-lg-12'>
+        <div className='card model-card'>
+          <div className='card-header'>
+            <h4 className='card-title'>Changes from Historic to Current State</h4>
+          </div>
+          <div className='card-header'></div>
+          <div className='card-content model-card-content'>
+              {properties}
+          </div>
+        </div>
+      </Col>
+    );
+  }else{
+    return(
+        <Col className='col-lg-12'>
+                <div className='card model-card'>
+                  <div className='card-header'>
+                    <h4 className='card-title'>Unable to pull diff</h4>
+                  </div>
+                  <div className='card-header'></div>
+                  <div className='card-content model-card-content'>
+                      Diff unable to be calculated currently, choose a different timeframe.
+                  </div>
+                </div>
+        </Col>
+    );
+  }
+};
+
+export default topologyDiffCard;
+
diff --git a/src/app/model/modelSearch/Model.jsx b/src/app/model/modelSearch/Model.jsx
new file mode 100644
index 0000000..9a49be9
--- /dev/null
+++ b/src/app/model/modelSearch/Model.jsx
@@ -0,0 +1,846 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import Filter from 'generic-components/filter/Filter.jsx';
+import OutputToggle from 'generic-components/OutputToggle.jsx';
+import {ExportExcel} from 'utils/ExportExcel.js';
+import commonApi from 'utils/CommonAPIService.js';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+import Spinner from 'utils/SpinnerContainer.jsx';
+import ModelGallery from './components/ModelGallery.jsx';
+import DatePicker from 'react-datepicker';
+import moment from "moment";
+import ModelBreadcrumb from './components/ModelBreadcrumb.jsx';
+import Grid from 'react-bootstrap/lib/Grid';
+import Row from 'react-bootstrap/lib/Row';
+import Col from 'react-bootstrap/lib/Col';
+import Button from 'react-bootstrap/lib/Button';
+import Modal from 'react-bootstrap/lib/Modal';
+import Pagination from 'react-js-pagination';
+import { ModelConstants } from './ModelConstants';
+import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger';
+import Tooltip from 'react-bootstrap/lib/Tooltip';
+import DownloadRangeModel from 'generic-components/DownloadRangeModel.jsx';
+import BootstrapSwitchButton from 'bootstrap-switch-button-react';
+
+let INVLIST = GlobalExtConstants.INVLIST;
+let DOWNLOAD_ALL = GlobalExtConstants.DOWNLOAD_ALL;
+let generateExcels = ExportExcel.generateExcels;
+let buildAttrList = ExportExcel.buildAttrList;
+let DOWNLOAD_TOOLTIP = GlobalExtConstants.DOWNLOAD_TOOLTIP;
+let ENVIRONMENT = GlobalExtConstants.ENVIRONMENT;
+let APERTURE_SERVICE = JSON.parse(sessionStorage.getItem(ENVIRONMENT + 'APERTURE_SERVICE'));
+let filterTypeList = GlobalExtConstants.FILTER_TYPES;
+let TABULAR_FILTER_TYPE = GlobalExtConstants.TABULAR_FILTER_TYPE;
+let URI_DELIMITCHAR = GlobalExtConstants.URI_DELIMITCHAR;
+/*const mapStateToProps = ({extensibility: {extModelReducer} }) => {
+      let {inventoryData} = extModelReducer;
+  return {
+        inventoryData
+      };
+};*/
+
+ const mapStateToProps = (state) => {
+  return {
+    currState: state.modelReducer
+  };
+};
+
+const mapActionToProps = (dispatch) => {
+  return {
+    onInventoryDataReceived: (data) => {
+      dispatch({ type: 'UPDATE_INVENTORY_DATA', data: data });
+    }
+  };
+};
+
+/**
+ * This class is used to handle any url interactions for models.
+ * When a user selects a inventory item in browse or special search,
+ * this model class should be used to handle the url + params and query
+ * the proxy server.
+ */
+
+export class model extends Component {
+
+  elements = [];
+  filterQuery = '';
+  pageTitle = '';
+  nodeType = '';
+  historyStackString = '';
+  typeOfCall = true;
+  nodeResults = '';
+  downloadTooltip = DOWNLOAD_TOOLTIP;
+  downloadAllTooltip = 'Downloads First ' + DOWNLOAD_ALL + ' Results';
+  downloadRangeTooltip= 'Downloads Results By Custom Range Selection';
+  initialFilterSelectedList = [];
+  initialFilterMessage = [];
+  initialNonDisplay = true;
+  constructor(props) {
+    console.log(props);
+    APERTURE_SERVICE = JSON.parse(sessionStorage.getItem(ENVIRONMENT + 'APERTURE_SERVICE'));
+    super(props);
+    var filterSelectedList = [];
+    var seletedFilter = [];
+    var filterMessage = [];
+    var nonDisplay = true;
+    var enableToggle= JSON.parse(sessionStorage.getItem(ENVIRONMENT + 'ENABLE_ANALYSIS'));
+    TABULAR_FILTER_TYPE=(APERTURE_SERVICE && enableToggle)?'CONTAINS':'='; 
+    if (this.props.match.params.type) {
+      seletedFilter = this.props.match.params.type.split(';');
+      seletedFilter.map((param) => {
+        console.log('param', param);
+        console.log('param.indexOf(=)', param.indexOf('='));
+        if (param.indexOf(URI_DELIMITCHAR+'='+URI_DELIMITCHAR) !== -1) {
+          let id = param.split(URI_DELIMITCHAR+'='+URI_DELIMITCHAR)[0];
+          let value = param.split(URI_DELIMITCHAR+'='+URI_DELIMITCHAR)[1];
+          filterSelectedList.push({ 'id': id, 'value': value, 'type':'='});
+          filterMessage.push(id+'='+value);
+          enableToggle=false;
+        }else{
+          for(var x in  filterTypeList){
+            if (param.indexOf(URI_DELIMITCHAR+filterTypeList[x]+URI_DELIMITCHAR) !== -1) {
+              let paramArray=param.split(URI_DELIMITCHAR+filterTypeList[x]+URI_DELIMITCHAR); 
+              let id = paramArray[0];
+              let value = paramArray[1];
+              filterSelectedList.push({ 'id': id, 'value': value, 'type': filterTypeList[x]});
+              filterMessage.push(id+filterTypeList[x]+value);
+              enableToggle=true;
+            }
+          }          
+        }
+      });
+    }
+    if (this.props.match.params.nodeId) {
+      nonDisplay = false;
+    }
+    if(this.props.match.params.page==='false'){
+      enableToggle=false;
+    }
+    if(!this.props.location.historyStackString){
+        this.props.location.historyStackString = this.props.location.pathname + ',,Origin||';
+    }else{
+        this.historyStackString = this.props.location.historyStackString;
+    }
+    this.state = {
+      activePage: 1,
+      totalResults: 0,
+      enableBusyFeedback: true,
+      data: [],
+      filterList: [],
+      nodes: [],
+      filterSelected: (this.props.match.params.type) ? this.props.match.params.type.split(';')[0] : '',
+      filterDisplay: 'Select Filter',
+      filterTypeDisplay: 'Filter Type',
+      filterMessage: filterMessage,
+      filterSelectedList: filterSelectedList,
+      isRunEnable: false,
+      isFilterEnable: nonDisplay,
+      isPaginationEnable: nonDisplay,
+      showHistoryModal: false,
+      nodeDisplay: 'test',
+      startDate: moment(),
+      historyType: 'nodeState',
+      enableCalendar: true,
+      focusedNodeUri: 0,
+      viewName: localStorage.getItem(GlobalExtConstants.ENVIRONMENT + '_' + sessionStorage.getItem(GlobalExtConstants.ENVIRONMENT + 'userId') + '_viewPreference')  || 'CardLayout',
+      errorResults: false,
+      errorMessage: '',
+      showResults: false,
+      resetColumnFilters: true,
+      defaultViewName: localStorage.getItem(GlobalExtConstants.ENVIRONMENT + '_' + sessionStorage.getItem(GlobalExtConstants.ENVIRONMENT + 'userId') + '_viewPreference')  || 'CardLayout',
+      isPageNumberChange: false,
+      totalPages: 0,
+      pageRange: 1,
+      showDownloadResultsModal: false,
+      errorDownloadResults:false,
+      downloadErrorMsg: '',      
+      enableModelBusyFeedback:false,
+      downloadCount:DOWNLOAD_ALL,
+      enableRealTime: enableToggle
+    };
+    this.baseState=this.state;
+  }
+  resultsMessage = '';
+  componentDidMount = () => {
+    console.log('[Model.jsx] componentDidMount props available are', JSON.stringify(this.props));
+    if (this.state.isFilterEnable) {
+      this.populateFilteringOptions();
+    }
+    this.initialFilterSelectedList = this.state.filterSelectedList;
+    this.initialFilterMessage = this.state.filterMessage;
+    this.initialNonDisplay = this.state.isFilterEnable;
+    this.beforefetchInventoryData();
+  };
+  handleDateChange = (newDate) =>{
+    this.setState({ startDate: moment(+newDate) });
+    console.log('[Model.jsx] handleDateChange date is ', this.state.startDate);
+    console.log('[Model.jsx] handleDateChange date is in millis ', +this.state.startDate);
+  }
+  openHistory = (nodeDisplay, nodeUri, nodeType) => { // open modal
+    console.log('history >> showModal');
+    let historyNodeUri = (nodeUri)?nodeUri.replace('/aperture/','/'):nodeUri;//replace always first occurence
+    if(nodeDisplay){
+       this.setState({
+          nodeDisplay: nodeDisplay,
+          focusedNodeUri: historyNodeUri,
+          focusedNodeType: nodeType,
+          showHistoryModal:true
+       });
+    }else{
+        this.setState({
+ 	      showHistoryModal:true
+        });
+    }
+  }
+  closeHistory = () => {
+	this.setState({
+		showHistoryModal: false
+	});
+  }
+  submitHistory = () => {
+    //do some logic in history
+    console.log("submitting history");
+    let epochStartTime = (this.state.startDate).unix();
+    this.props.history.push('/history/' + this.state.historyType+'/' + this.nodeType + '/' + btoa(this.state.focusedNodeUri) + '/' + epochStartTime * 1000);
+  }
+  setHistoryType(event) {
+    console.log(event.target.value);
+    let enableCalendar = false;
+    if(event.target.value === 'nodeLifeCycle'){
+        enableCalendar = false;
+    }else{
+        enableCalendar = true;
+    }
+    this.setState({
+    		historyType: event.target.value,
+    		enableCalendar: enableCalendar
+    });
+    console.log(this.state.enableCalendar);
+  }
+  setViewName(event) {
+    console.log(event.currentTarget.value);
+    this.setState({
+    		viewName: event.currentTarget.value
+    });
+  }
+  setDefaultViewName = (event) =>{
+    let ENVIRONMENT = GlobalExtConstants.ENVIRONMENT;
+    let layout =  event.target.value;
+
+    if(sessionStorage.getItem(ENVIRONMENT + 'userId')) {
+      if (event.target.checked) {
+        localStorage.setItem(ENVIRONMENT + '_' + sessionStorage.getItem(ENVIRONMENT + 'userId') + '_viewPreference', layout);
+      } else {
+        localStorage.removeItem(ENVIRONMENT + '_' + sessionStorage.getItem(ENVIRONMENT + 'userId') + '_viewPreference');
+      }
+    }
+
+    this.setState({
+      defaultViewName: event.target.value
+    });
+    this.baseState.viewName=event.target.value;
+    this.baseState.defaultViewName=event.target.value;
+  }
+  componentWillUnmount  = () => {
+    console.log('[Model.jsx] componentWillUnMount');
+    this.props.onInventoryDataReceived([]);
+  }
+  beforefetchInventoryData = (param) => {
+    this.typeOfCall = true;
+    if (param) {
+      this.props.onInventoryDataReceived([]);
+      this.formFilterQuery(param.filterMessage);
+      this.setState(
+        { enableBusyFeedback: true, activePage: 1, totalResults: 0, totalPages: 0,filterMessage: param.filterMessage, filterSelectedList: param.filterSelectedList},
+        function () { this.fetchInventoryData(param); }.bind(this)
+      );
+    } else {
+      this.formFilterQuery(this.state.filterMessage);
+      this.fetchInventoryData();
+    }
+  };
+
+  formFilterQuery = (filterMessage) => {
+    let filterQuery = filterMessage.join('&');
+    this.filterQuery = (filterMessage.length > 0) ? '&' + filterQuery : '';
+  };
+
+  fetchInventoryData = (param) => {
+    console.log('fetchInventoryData', param);
+    this.resultsMessage = '';    
+    const inventory = INVLIST.INVENTORYLIST;
+    let url = '';
+    console.log('[Model.jsx] fetchInventoryData nodeId= ', this.props.match.params.nodeId);
+    if (this.props.match.params.type !== undefined && this.props.match.params.type !== null) {
+      this.nodeType = this.props.match.params.type;
+    }
+    console.log('[Model.jsx] nodeType: ' + this.nodeType);
+    let pageName = this.nodeType.split(';')[0].replace(/\s/g, '').toUpperCase();
+    console.log('[Model.jsx] pageName: ' + pageName);
+    if (inventory[pageName] && inventory[pageName].display) {
+      this.pageTitle = inventory[pageName].display;
+    } else {
+      this.pageTitle = pageName;
+    }
+    var nonRelationshipState = false;
+    if (this.props.match.params.nodeId) {
+      this.setUri(this.props.location.uri);
+      this.setBreadcrumb(this.props.location.uri);
+      url = sessionStorage.getItem(ENVIRONMENT + 'URI');
+      if(this.state.enableRealTime){
+        let versionPattern="^"+INVLIST.VERSION+"\\/";
+        var versionRegularExp = new RegExp(versionPattern, 'g');
+        let matchVersion = url.match(versionRegularExp,'g');
+        if(!matchVersion){
+          url= INVLIST.VERSION+'/'+url;
+        } 
+      } 
+    } else {
+      url = inventory[pageName].apiPath;
+      this.setBreadcrumb(url);
+      nonRelationshipState=true;
+    }
+    console.log('[Model.jsx] active page', this.state.activePage);
+    console.log('this.state.filterSelectedList', this.state.filterSelectedList);
+    console.log('filterQuery', this.filterQuery);
+    //Aperture with Diff Filter types Operater  
+    this.nodeResults = '';
+    var method = 'GET';
+    var payload = {};
+    const settings = {
+      'NODESERVER': INVLIST.NODESERVER,
+      'PROXY': INVLIST.PROXY,
+      'PREFIX': INVLIST.PREFIX,
+      'VERSION': INVLIST.VERSION,
+      'USESTUBS': INVLIST.useStubs,
+      'APERTURE': INVLIST.APERTURE,
+      'APERTURE_SERVICENAME':INVLIST.APERTURE_SERVICENAME
+    };
+    if(this.state.enableRealTime){
+      settings['ISAPERTURE'] = (nonRelationshipState)? true : false;
+    }else{
+      if(!(this.state.enableRealTime && nonRelationshipState)){
+        url = (url)?url.replace(INVLIST.VERSION+'/',''):url;
+      }
+    } 
+    if(this.state.enableRealTime && nonRelationshipState){
+      var filterList=this.state.filterSelectedList;
+      var filters = [];
+      for(var k in filterList){
+        if(filterList.hasOwnProperty(k)){
+          let filter ={}
+          filter['filter']= filterList[k].type;
+          filter['key'] = filterList[k].id;
+          filter['value'] = filterList[k].value;
+          filters.push(filter);
+        }
+      }
+      method= 'POST';
+      payload['node-type'] = url.split('/')[1];
+      payload['filter-version'] = 'v1';
+      payload['filters'] = filters;
+    }else{
+      payload = null;
+    }
+    
+    var path = '?format=simple&resultIndex=' + this.state.activePage + '&resultSize=';      
+    if(this.typeOfCall){  
+      path = path + ModelConstants.RESULTS_PER_PAGE;
+      url=(this.state.enableRealTime && nonRelationshipState)? path: url + path + this.filterQuery;
+      this.commonApiServiceCall(settings,url,param,method,payload);
+    }else{
+      let pagerange=this.state.pageRange.toString();
+      pagerange=pagerange.split('-');
+      if(pagerange.length > 1){
+        path = '?format=simple&resultIndex=' + parseInt(pagerange[0]) + '&resultSize='+ ModelConstants.RESULTS_PER_PAGE + '&resultRangeEnd=' + parseInt(pagerange[1]);
+      }else{
+        path = '?format=simple&resultIndex=' + 1 + '&resultSize=' + parseInt(pagerange);
+      }
+      url=(this.state.enableRealTime && nonRelationshipState)? path: url + path + this.filterQuery; 
+      this.commonApiServiceCallForAllData(settings,url,method,payload);
+    }
+  };
+  commonApiServiceCall = (settings,url,param,method,payload) =>{
+    
+    commonApi(settings, url, method, payload, 'modelDefault')
+      .then(res => {
+        // Call dispatcher to update state
+        console.log('once before service call ......',this.state);
+        this.resultsMessage = '';
+        var totalResults = parseInt(res.headers['total-results']); 
+        let downloadCount = DOWNLOAD_ALL;   
+        if(totalResults > DOWNLOAD_ALL){
+          this.downloadAllTooltip = DOWNLOAD_ALL + ' results out of '+ totalResults +' will be downloaded, please filter results further to obtain full report';
+        }else{
+          this.downloadAllTooltip = (totalResults === 1) ? 'Downloads ' + totalResults + ' Results' : 'Downloads all ' + totalResults + ' Results'
+          downloadCount= totalResults;
+        }   
+        this.setState(
+          {
+            nodes : res.data.results,
+            totalResults : res.headers['total-results'],
+            totalPages: res.headers['total-results'],
+            enableBusyFeedback:false,
+            showResults: true,
+            errorResults: false,
+            downloadCount: downloadCount,
+            filterSelectedList:(param)?param.filterSelectedList:this.state.filterSelectedList
+          },function(){this.props.onInventoryDataReceived(res.data.results);});
+                       
+        console.log('After service call ......',this.state);
+        console.log('[Model.jsx] results : ', res);
+        }, error=>{
+       	   this.triggerError(error);
+        }).catch(error => {
+           this.triggerError(error);
+      });
+  };
+  commonApiServiceCallForAllData = (settings,url,method,payload) => {
+
+    commonApi(settings, url,method, payload, 'modelDefault')
+      .then(res => {
+        // Call dispatcher to update state        
+        console.log('once before service call ......',this.state);
+        this.resultsMessage = '';
+        this.nodeResults = res.data.results;
+        let totalResults = parseInt(res.headers['total-results']);
+        let totalPages = parseInt(res.headers['total-pages']);
+        this.setState({totalPages:totalPages,errorDownloadResults:false,downloadErrorMsg:''},() => {this.getAllExcels()});
+        console.log('[Model.jsx] results : ', res);
+      }).catch(error => {
+        console.log('[Model.jsx] error : ', error);
+        this.nodeResults = '';
+        let errMsg = this.renderErrorMsg(error);      
+        this.setState({ enableBusyFeedback: false,errorDownloadResults:true,downloadErrorMsg:errMsg,enableModelBusyFeedback:false});       
+      });     
+  };
+
+   triggerError = (error) => {
+      console.error('[Model.jsx] error : ', JSON.stringify(error));
+      this.props.onInventoryDataReceived([]);
+      this.resultsMessage = 'No Results Found';
+      this.downloadAllTooltip = 'Downloads First ' + DOWNLOAD_ALL + ' Results';
+      this.nodeResults = '';
+      this.setState({
+            enableBusyFeedback: false,
+            totalResults: 0,
+            totalPages: 0,
+          	showResults: false,
+          	errorResults: true
+        });
+      let errMsg = this.renderErrorMsg(error);
+      //Suppress Error Message when 404 results not found occur
+      if(error.response && error.response.status === 404){
+        this.setState({errorMessage:'', errorResults:false});
+      }else{
+            this.setState({errorMessage:errMsg});
+      }
+    };
+    renderErrorMsg = (error) =>{
+      let errMsg='';
+       if (error.response) {
+         // The request was made and the server responded with a status code
+         // that falls out of the range of 2xx
+         console.log(error.response.data);
+         console.log(error.response.status);
+         console.log(error.response.headers);
+         if(error.response.status){
+             errMsg += " Code: " + error.response.status;
+         }
+    	 if(error.response.data){
+             errMsg += " - " + JSON.stringify(error.response.data);
+         }
+       } else if (error.request) {
+         // The request was made but no response was received
+         // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
+         // http.ClientRequest in node.js
+         console.log(error.request);
+         errMsg += " - Request was made but no response received";
+       } else {
+         // Something happened in setting up the request that triggered an Error
+         console.log('Error', error.message);
+         errMsg += " - Unknown error occurred " + error.message;
+       }
+      
+       console.log(error.config);
+       return errMsg;
+    }
+
+  componentWillReceiveProps(nextProps) {
+    console.log('[Model.jsx] componentWillReceiveProps');
+    console.log('[Model.jsx] next nodeId:', nextProps.match.params.nodeId);
+    console.log('[Model.jsx] this nodeId:', this.props.match.params.nodeId);
+
+    if(nextProps.match.params.nodeId !== undefined && this.props.match.params.nodeId !== undefined){
+      if (nextProps.match.params.nodeId && nextProps.match.params.nodeId
+        !== this.props.match.params.nodeId) {
+        this.props = nextProps;
+        this.beforefetchInventoryData();
+      }
+    }
+  };
+
+  setUri(uri) {
+    let delimiter = '\/';
+    let start = 3;
+    let tokens = uri.split(delimiter).slice(start);
+    let result = tokens.join(delimiter);
+    sessionStorage.setItem(ENVIRONMENT + 'URI', result);
+  };
+
+  setBreadcrumb(uri){
+      var nodeType = this.nodeType.split(';')[0];
+      var display = nodeType + ': ' + (uri).split(nodeType+'\/').pop();
+      var hsEntry = this.props.location.pathname + ',' + uri +  ','+ display + '||';
+      console.log("History Stack String: " + this.props.location.historyStackString);
+       if(this.historyStackString.indexOf(hsEntry) > -1){
+          var tempHistoryStack = this.historyStackString.split(hsEntry)[0];
+          var tempHistoryStackFormat = tempHistoryStack.replace(hsEntry, "");
+          this.historyStackString = tempHistoryStackFormat;
+       }
+      this.historyStackString += hsEntry;
+      this.props.location.historyStackString = this.historyStackString;
+      console.log('[Model.jsx] historyStack in model' + this.historyStackString);
+  }
+
+  handlePageChange = (pageNumber) => {
+    console.log('[Model.jsx] HandelPageChange active page is', pageNumber);
+    this.props.onInventoryDataReceived([]);
+    this.setState(
+      { activePage: pageNumber, enableBusyFeedback: true, resetColumnFilters: false, isPageNumberChange: true},
+      function () { this.beforefetchInventoryData(); }.bind(this)
+    );
+  };
+  openDownloadRange = () =>{    
+      this.setState({
+        showDownloadResultsModal: true,
+        errorDownloadResults: false,
+        downloadErrorMsg:''});    
+  }
+  closeDownloadResults = () =>{
+    this.setState({
+      showDownloadResultsModal: false,
+      enableModelBusyFeedback: false
+		});   
+  }
+  getAllExcels = (pageRange,rangeState) =>{
+    console.log('getAllExcels>>>>>>>>>>>*',pageRange);
+    if(pageRange){
+      this.typeOfCall=false;
+      let rangeModelState=(rangeState)? rangeState: false;
+      this.setState(
+        { pageRange: pageRange,enableBusyFeedback: true, enableModelBusyFeedback:true,showDownloadResultsModal:rangeModelState},
+        function () { this.fetchInventoryData(); }.bind(this)
+      );
+    }else{
+      this.setState(
+        {errorDownloadResults: false, showDownloadResultsModal: false, downloadErrorMsg:'', enableBusyFeedback: false, enableModelBusyFeedback:false},
+        function () { generateExcels(this.nodeResults);this.nodeResults='';this.typeOfCall = true;}.bind(this)
+      );
+    }     
+  };
+  
+  populateFilteringOptions = () => {
+    let tempState = this.state;
+    tempState.filterList = buildAttrList(this.state.filterSelected, tempState.filterList);
+    this.setState(tempState);
+  };
+
+  // HELPER FUNCTIONS
+  isContaining = (nameKey, listArray) => {
+    let found = false;
+    listArray.map((lists) => {
+      if (lists.id === nameKey) {
+        found = true;
+      }
+    });
+    return found;
+  };
+  isTableFilterApply = (columnFilterList,nodeType,columnsList) => {
+    console.log('Model js ....columnFilterList:',columnFilterList);
+    console.log('Model js .... nodeType:',nodeType);
+    var columnFilter = columnFilterList[nodeType][0];
+    console.log('model js columnFilter:',columnFilter);    
+    var columns = columnsList[nodeType];
+    var applyState = false;
+    var filterSelectedList = [];
+    var filterMessage = [];
+    
+    for(var i=0;i<columnFilter.length;i++){
+      var colFilterValue = columnFilter[i][columns[i].value];      
+      if(colFilterValue != ""){        
+        filterSelectedList.push({ 'id': columns[i].value, 'value': colFilterValue, 'type': TABULAR_FILTER_TYPE});
+        let filterMsg = columns[i].value + TABULAR_FILTER_TYPE + colFilterValue;
+        filterMessage.push(filterMsg); 
+        applyState = true;         
+      }
+    }
+    console.log('isTableFilterApply filterSelectedList>>>>>',filterSelectedList);
+    console.log('isTableFilterApply filterMessage>>>>>>>>>>',filterMessage); 
+        
+    if(applyState){  
+      var tempState = this.state;
+      var state = true;
+      var stateFilterSelectedList = tempState.filterSelectedList;
+        var id = 'id';
+        var value = 'value';
+        if(stateFilterSelectedList.length > 0){
+          for(var j in filterSelectedList){
+            state = true;
+            for(var k in stateFilterSelectedList){
+              if(stateFilterSelectedList[k][id] === filterSelectedList[j][id]){ 
+                state =false;                              
+                tempState.filterSelectedList[k] = { 'id':filterSelectedList[j][id], 'value': filterSelectedList[j][value], 'type': TABULAR_FILTER_TYPE};
+              }
+            }
+            if(state){
+              tempState.filterSelectedList.push({ 'id':filterSelectedList[j][id], 'value': filterSelectedList[j][value],  'type': TABULAR_FILTER_TYPE});
+            }            
+          }
+          stateFilterSelectedList = tempState.filterSelectedList;
+          for(var k in stateFilterSelectedList){
+            tempState.filterMessage[k] = stateFilterSelectedList[k][id] + TABULAR_FILTER_TYPE + stateFilterSelectedList[k][value]
+          }
+        }else{
+          tempState.filterSelectedList = filterSelectedList;
+          tempState.filterMessage = filterMessage;
+        }
+
+        console.log('isTableFilterApply  tempState:',tempState);
+        this.beforefetchInventoryData(tempState);
+    }
+  };
+  prepareModelGalleryElement = () =>{
+    let modelGalleryElement='';
+    if(this.state.isFilterEnable){
+      modelGalleryElement = <ModelGallery nodes={this.props.currState.inventoryData}
+                                  viewName={this.state.viewName}
+                                  historyStackString={this.props.location.historyStackString}
+                                  openHistoryModal={this.openHistory}
+                                  isPageNumberChange={this.state.isPageNumberChange}
+                                  resetColumnInd={this.state.resetColumnFilters}
+                                  isTableFilterApply={this.isTableFilterApply}
+                                  enableRealTime={this.state.enableRealTime}
+                                />;
+    }else{
+      modelGalleryElement = <ModelGallery nodes={this.props.currState.inventoryData}
+                                  viewName={this.state.viewName}
+                                  historyStackString={this.props.location.historyStackString}
+                                  openHistoryModal={this.openHistory}
+                                  isPageNumberChange={this.state.isPageNumberChange}
+                                  resetColumnInd={this.state.resetColumnFilters}
+                                  enableRealTime={this.state.enableRealTime}
+                                />;
+    }
+    return modelGalleryElement;
+  }
+  prepareDownloadRangeModel = () =>{
+  
+    let downloadRangeModel =(this.state.showDownloadResultsModal)? <DownloadRangeModel 
+              showDownloadResultsModal={this.state.showDownloadResultsModal}
+              totalPages={this.state.totalPages}
+              totalResults={this.state.totalResults}
+              triggerDownload={this.getAllExcels}
+              errorDownloadResults={this.state.errorDownloadResults}
+              downloadErrorMsg={this.state.downloadErrorMsg}
+              triggerClose={this.closeDownloadResults}
+              enableModelBusyFeedback={this.state.enableModelBusyFeedback}
+          /> : '';
+    return downloadRangeModel;
+  }
+  toggleRealTimeAnalysisCallback=(checked)=>{
+    console.log('toggleRealTimeAnalysisCallback>>>>',checked);
+    sessionStorage.setItem(ENVIRONMENT + 'ENABLE_ANALYSIS', !checked);
+    TABULAR_FILTER_TYPE=(APERTURE_SERVICE && !checked)?'CONTAINS':'=';
+    this.baseState.enableRealTime = !checked;
+    this.baseState.filterMessage = [];
+    this.baseState.filterSelectedList = [];
+    this.setState({...this.baseState},()=>{this.beforefetchInventoryData(this.state)});
+  }
+  render() {
+    console.log('[Model Props] render: ', JSON.stringify(this.props) + 'elements : ', this.elements);
+    console.log('[Model nodeId] render: ', this.props.match.params.nodeId);
+    console.log('[Model nodeId] render this.state: ', this.state);
+    var toggelRealtimeAnalysis = '';
+	  if(APERTURE_SERVICE){		
+		  toggelRealtimeAnalysis = <div className='toggleSwitch'><BootstrapSwitchButton
+                                checked={!this.state.enableRealTime}
+                                onlabel='Real Time'
+                                onstyle='danger'
+                                offlabel='Analysis'
+                                offstyle='success'
+                                style='w-100 mx-3'
+                                onChange={(checked) => {
+                                  this.toggleRealTimeAnalysisCallback(checked);
+                                }}
+                              /></div>             
+	  }
+    const modelGalleryElement = this.prepareModelGalleryElement();
+    let downloadRangeModel = this.prepareDownloadRangeModel();
+    return (
+      <div>
+        {toggelRealtimeAnalysis}
+        <Grid fluid={true} className='model-container'>
+          <Row className='show-grid'>
+            <Col md={12}>
+              <h1>{this.pageTitle}</h1>
+              <Filter key='browseSearch'
+                nodeType={this.state.filterSelected}
+                filterList={this.state.filterList}
+                filterDisplay={this.state.filterDisplay}
+                filterTypeDisplay={this.state.filterTypeDisplay}
+                isRunEnable={this.state.isRunEnable}
+                filterMessage={this.state.filterMessage}
+                loadInventory={this.beforefetchInventoryData}
+                filterSelectedList={this.state.filterSelectedList}
+                isFilterEnable={this.state.isFilterEnable} 
+                enableRealTime={this.state.enableRealTime}/>
+            </Col>
+          </Row>
+          <Spinner loading={this.state.enableBusyFeedback}>
+            <Row className='show-grid'>
+              <Col md={8} className={this.state.isPaginationEnable && this.state.showResults ? 'show' : 'hidden'}>
+                <Pagination
+                  activePage={this.state.activePage}
+                  itemsCountPerPage={ModelConstants.RESULTS_PER_PAGE}
+                  totalItemsCount={this.state.totalResults}
+                  pageRangeDisplayed={ModelConstants.PAGE_RANGE_DISPLAY}
+                  onChange={this.handlePageChange} />
+              </Col>
+              <Col md={2} className={this.state.isPaginationEnable && this.state.showResults ? 'text-right' : 'text-left'}>
+                <OverlayTrigger  placement='top' overlay={<Tooltip id='tooltip-top'>{this.downloadAllTooltip}</Tooltip>}>
+                  <span className='d-inline-block' style={{display: 'inline-block'}}>
+                    <Button bsSize='small' onClick={() => {this.getAllExcels(this.state.downloadCount)}}>
+                      Download XLSX <i className='icon-documents-downloadablefile'></i>
+                    </Button>
+                  </span>
+                </OverlayTrigger>
+              </Col>
+              <Col md={2} className={this.state.isPaginationEnable && this.state.showResults ? 'text-right' : 'text-left'}>
+                <OverlayTrigger  placement='top' overlay={<Tooltip id='tooltip-top'>{this.downloadRangeTooltip}</Tooltip>}>
+                  <span className='d-inline-block' style={{display: 'inline-block'}}>
+                    <Button bsSize='small' onClick={this.openDownloadRange}>
+                      Download XLSX (Range)<i className='icon-documents-downloadablefile'></i>
+                    </Button>
+                  </span>
+                </OverlayTrigger>
+              </Col>
+            </Row>
+            <Row className='show-grid'>
+                <ModelBreadcrumb historyStackString={this.props.location.historyStackString}/>
+            </Row>
+            <Row>
+              <div className={'addPaddingTop alert alert-danger ' +(this.state.errorResults ? 'show' : 'hidden')} role="alert">
+                  An error occurred, please try again later. If this issue persists, please contact the system administrator. {this.state.errorMessage}
+              </div>
+            </Row>
+            <Row className='show-grid'>
+              { this.state.showResults && <div className='addPaddingTop'>
+                  <OutputToggle scope={this} visualDisabled={true}/>
+                </div>
+              }
+            </Row>  
+            <Row className={'show-grid ' + this.state.showResults ? 'show' : 'hidden'}>
+              <Col md={12}>
+                <hr />
+                <h5>Total Results: <strong>{this.state.totalResults}</strong></h5>
+                <span className='resultMessage'>{this.resultsMessage}</span>
+              </Col>
+            </Row>
+            <Row className='show-grid'>
+              {           
+                modelGalleryElement            
+              }         
+            </Row>
+            <Row className='show-grid'>
+              <Col md={12} className={this.state.isPaginationEnable && this.state.showResults ? 'show' : 'hidden'}>
+                <Pagination
+                  activePage={this.state.activePage}
+                  itemsCountPerPage={ModelConstants.RESULTS_PER_PAGE}
+                  totalItemsCount={this.state.totalResults}
+                  pageRangeDisplayed={ModelConstants.PAGE_RANGE_DISPLAY}
+                  onChange={this.handlePageChange} />
+              </Col>
+            </Row>
+            <div className='static-modal'>
+                <Modal show={this.state.showHistoryModal} onHide={this.closeHistory}>
+                  <Modal.Header>
+                    <Modal.Title>Retrieve {this.state.nodeDisplay} History</Modal.Title>
+                  </Modal.Header>
+                  <Modal.Body>
+                    <form>
+                              <div className="radio">
+                                <label>
+                                  <input type="radio" value="nodeState"
+                                                checked={this.state.historyType === 'nodeState'}
+                                                onChange={(e) => this.setHistoryType(e)} />
+                                  View state at
+                                </label>
+                              </div>
+                              <div className="radio">
+                                <label>
+                                  <input type="radio"  value="nodeLifeCycleSince"
+                                                checked={this.state.historyType === 'nodeLifeCycleSince'}
+                                                onChange={(e) => this.setHistoryType(e)} />
+                                  View updates since
+                                </label>
+                              </div>
+                              <div className="radio">
+                                <label>
+                                  <input type="radio" value="nodeLifeCycle"
+                                                checked={this.state.historyType === 'nodeLifeCycle'}
+                                                onChange={(e) => this.setHistoryType(e)} />
+                                  View all updates
+                                </label>
+                              </div>
+                            </form>
+                    <div className={this.state.enableCalendar ? 'show' : 'hidden'}>
+                        <DatePicker
+                            inline
+                                  selected={this.state.startDate}
+                                  onChange={(newDate) => this.handleDateChange(newDate)}
+                                  showTimeSelect
+                                  timeFormat="HH:mm"
+                                  timeIntervals={15}
+                                  dateFormat="MMMM D, YYYY h:mm a"
+                                  timeCaption="time"
+                              />
+                          </div>
+                  </Modal.Body>
+                  <Modal.Footer>
+                    <Button onClick={this.closeHistory}>Close</Button>
+                    <Button onClick={this.submitHistory}>Submit</Button>
+                  </Modal.Footer>
+                </Modal>
+            </div>
+          </Spinner>
+          <Spinner loading={this.state.enableModelBusyFeedback}>
+            {downloadRangeModel}
+          </Spinner>
+        </Grid>
+      </div>
+    );
+  }
+}
+
+export default connect(mapStateToProps, mapActionToProps)(model);
diff --git a/src/app/model/modelSearch/ModelActions.js b/src/app/model/modelSearch/ModelActions.js
new file mode 100644
index 0000000..e5faa35
--- /dev/null
+++ b/src/app/model/modelSearch/ModelActions.js
@@ -0,0 +1,20 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
diff --git a/src/app/model/modelSearch/ModelConstants.js b/src/app/model/modelSearch/ModelConstants.js
new file mode 100644
index 0000000..a9758c6
--- /dev/null
+++ b/src/app/model/modelSearch/ModelConstants.js
@@ -0,0 +1,25 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+export const ModelConstants = {
+  UPDATE_INVENTORY_DATA : 'UPDATE_INVENTORY_DATA',
+  RESULTS_PER_PAGE : 50 ,
+  PAGE_RANGE_DISPLAY : 10
+};
diff --git a/src/app/model/modelSearch/ModelReducer.js b/src/app/model/modelSearch/ModelReducer.js
new file mode 100644
index 0000000..0ea0c08
--- /dev/null
+++ b/src/app/model/modelSearch/ModelReducer.js
@@ -0,0 +1,43 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import {ModelConstants} from './ModelConstants';
+
+const initalState = {
+  inventoryData: []
+};
+
+export default (state = initalState, action) => {
+  switch (action.type) {
+    case(ModelConstants.UPDATE_INVENTORY_DATA):
+      console.log('[ModelReducer] action.data:', action.data);
+      return {
+        ...state,
+        inventoryData: action.data
+      };
+    default:
+      return {
+        ...state
+      };
+  }
+
+};
+
+
diff --git a/src/app/model/modelSearch/components/ModelBreadcrumb.jsx b/src/app/model/modelSearch/components/ModelBreadcrumb.jsx
new file mode 100644
index 0000000..ffcddb1
--- /dev/null
+++ b/src/app/model/modelSearch/components/ModelBreadcrumb.jsx
@@ -0,0 +1,72 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React from 'react';
+import Col from 'react-bootstrap/lib/Col';
+import Label from 'react-bootstrap/lib/Label';
+import { Link } from 'react-router-dom';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+
+const modelBreadcrumb = (props) => {
+
+ let links = null;
+ let historyStackArr = [];
+ var setURIInSession = function(uri){
+    sessionStorage.setItem(GlobalExtConstants.ENVIRONMENT + 'URI', uri);
+ }
+    if (props.historyStackString) {
+      historyStackArr = props.historyStackString.split('||');
+      for(var i = 0; i < historyStackArr.length; i++){
+         historyStackArr[i] = historyStackArr[i].split(',');
+         console.log('[ModelBreadcrumb.jsx] previous url ' + historyStackArr[i][0] + ' previous api call '+ historyStackArr[i][1]);
+      }
+      links = historyStackArr.map((link, idx) => {
+        let breadCrumbTxt=decodeURI(link[2]).replace(/%2F/g,'/');
+        return (
+                <div className='customBreadCrumb'>
+                {idx === historyStackArr.length - 2 ? (
+                    <b id={'breadcrumbStatic' + idx} style={{'float' : 'left'}}>{breadCrumbTxt}</b>
+                    ) : idx !== historyStackArr.length - 1 ? (
+                    <div id={'breadcrumbLink' + idx}>
+                      <div style={{'float' : 'left'}}>                          
+                        <Link
+                          key={idx}
+                          to={{
+                            pathname: link[0],
+                            uri: link[1],
+                            historyStackString: (breadCrumbTxt==='Origin')?'':props.historyStackString
+                          }} onClick={() => setURIInSession(link[1])}>{breadCrumbTxt}
+                        </Link>
+                    </div>
+                      <div style={{'float' : 'left'}}>&nbsp;&nbsp;&#x3E;&#x3E;&nbsp;&nbsp;</div>
+                </div>
+                 ):(<div></div>)}
+                 </div>
+        );
+      });
+    }
+  return (
+    <Col md={12}  className='addPaddingTop'>
+        {links}
+    </Col>
+  );
+};
+
+export default modelBreadcrumb;
diff --git a/src/app/model/modelSearch/components/ModelCard.jsx b/src/app/model/modelSearch/components/ModelCard.jsx
new file mode 100644
index 0000000..2890b52
--- /dev/null
+++ b/src/app/model/modelSearch/components/ModelCard.jsx
@@ -0,0 +1,75 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React from 'react';
+import ModelRelationships from './ModelRelationships.jsx';
+import { Link } from 'react-router-dom';
+import {ExportExcel} from 'utils/ExportExcel.js';
+let buildAttrList = ExportExcel.buildAttrList;
+
+const modelCard = (props) => {
+
+  var propKey = '';
+  var navigateQueryBuilder = '';
+  var editModalIcon = '';
+  var requiredParams = buildAttrList(props.nodeType,[],'mandatory');
+  const properties = Object.keys(props.nodeProps).map((prop, idx) => {
+    let description='';
+    for(var a in requiredParams){
+      if(requiredParams[a].value === prop){
+        description=requiredParams[a].description;
+        if(propKey === ''){
+          propKey = prop + ':' + btoa('<pre>' + props.nodeProps[prop].toString() + '</pre>');
+        }else{
+          propKey = propKey + ';' + prop + ':' + btoa('<pre>' + props.nodeProps[prop].toString() + '</pre>');
+        }
+      }
+    }
+    return (
+      <p className='pre-wrap-text' key={idx}><strong title={description}>{prop}:</strong> {props.nodeProps[prop].toString()}</p>
+    );
+  });
+  let pathNameStr = '/customDslBuilder/' + props.nodeType + '/' + propKey;
+  editModalIcon = <a className={props.isWriteAllowed ? 'show' : 'hidden'} onClick={e => {props.openEditNodeModal(props.nodeUrl)}}><i style={{cursor: 'pointer'}} className="pull-right fa fa-pencil-square-o" aria-hidden="true"></i></a>;
+  navigateQueryBuilder = <Link
+                  to={{
+                    pathname: pathNameStr
+                   }}>
+                   <i className={'icon-misc-operationsL pull-right'} role="img"></i>
+                   </Link>;
+  return (
+    <div className='card model-card'>
+      <div className='card-header'>
+        <h4 className='card-title'>{props['nodeType']}{editModalIcon}{navigateQueryBuilder}</h4>
+      </div>
+      <div className='card-header'>
+        {props.nodeUrl}
+      </div>
+      <div className='card-content model-card-content'>
+        {properties}
+      </div>
+      <div className='card-footer'>
+        <ModelRelationships historyStackString={props.historyStackString} relatives={props} openHistoryModal={props.openHistoryModal} />
+      </div>
+    </div>
+  );
+};
+
+export default modelCard;
diff --git a/src/app/model/modelSearch/components/ModelGallery.jsx b/src/app/model/modelSearch/components/ModelGallery.jsx
new file mode 100644
index 0000000..d192708
--- /dev/null
+++ b/src/app/model/modelSearch/components/ModelGallery.jsx
@@ -0,0 +1,672 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, { Component } from 'react';
+import Grid from 'react-bootstrap/lib/Grid';
+import Row from 'react-bootstrap/lib/Row';
+import Col from 'react-bootstrap/lib/Col';
+import ModelCard from './ModelCard.jsx';
+import Modal from 'react-bootstrap/lib/Modal';
+import Button from 'react-bootstrap/lib/Button';
+import BootstrapTable from 'react-bootstrap-table-next';
+import {ExportExcel} from 'utils/ExportExcel.js';
+import filterFactory, { textFilter, customFilter } from 'react-bootstrap-table2-filter';
+//import overlayFactory from 'react-bootstrap-table2-overlay';
+import OutputVisualization from 'generic-components/OutputVisualization.jsx';
+import RelationshipList from './ModelTabularView.jsx';
+import PropTypes from 'prop-types';
+import Tabs from 'react-bootstrap/lib/Tabs';
+import Tab from 'react-bootstrap/lib/Tab';
+import commonApi from 'utils/CommonAPIService.js';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+import {GeneralCommonFunctions} from 'utils/GeneralCommonFunctions.js';
+import Spinner from 'utils/SpinnerContainer.jsx';
+
+let INVLIST = GlobalExtConstants.INVLIST;
+let ENVIRONMENT = GlobalExtConstants.ENVIRONMENT;
+
+/**
+ * This function will take all of the node objects and turn them into
+ * a ui grid of ModelCard components. This function is essentially a container
+ * for the ModelCards
+ * @param props
+ * @returns {*}
+ */
+class AttributeFilter extends Component {
+  
+  constructor(props) {
+    super(props);
+    this.filter = this.filter.bind(this);
+    this.getValue = this.getValue.bind(this);
+    this.props = props;
+    this.state = {
+      filterText: '',
+      isPageChange: this.props.isPageChange,
+      columnValue : ''
+    };
+  }
+  getValue = () => {
+    return this.input.value;
+  }
+  setPlaceHolder = () => {
+    let filterText = '';
+    if(filterText === ''){
+      filterText = 'Enter ' + this.props.column.text;
+    }
+    return filterText;
+  }
+  setFilterValue = () =>{
+    let filterText = '';
+    var columnFilter = this.props.columnFilterList[this.props.nodeType][0];
+    for(var i=0;i<columnFilter.length;i++){
+      if(columnFilter[i][this.props.column.text] != undefined){
+        filterText = columnFilter[i][this.props.column.text];        
+      }
+    }    
+    return filterText;
+  }
+  filter = () => {
+    let txt=this.props.column.text;
+    let obj = {};
+    obj[txt] = this.getValue();
+    var columnFilterList = this.props.columnFilterList;
+    var columnFilter = columnFilterList[this.props.nodeType][0];    
+   for(var i=0;i<columnFilter.length;i++){
+      if(columnFilter[i][txt] != undefined){
+        columnFilter[i][txt] = this.getValue();
+        columnFilterList[this.props.nodeType] = [];
+        columnFilterList[this.props.nodeType].push(columnFilter);
+        this.props.handleOnFilter(columnFilterList,this.props.nodeType,this.props.columns,this.getValue(),this.props.aliasColumnList);        
+        this.props.onFilter(this.getValue());      
+      }
+    }
+  }
+  render() {
+    return (
+      <div>
+        
+          <input
+          key="input"
+          ref={ node => this.input = node }
+          type="text"
+            placeholder={this.setPlaceHolder()}
+           // value={this.setFilterValue}
+            onChange={this.filter}
+          />
+        
+      </div>
+    )
+  }
+}
+
+class ModelGallery extends Component {
+  constructor(props){
+    super(props);
+    this.props = props;
+    this.state = {
+      rerender: false,
+      expanded: [],
+      columnFilterList : {},
+      columnsList: {},
+      aliasColumnList: {},
+      nodeType: '',
+      disableFilter: true,
+      showEditNodeModal: false,
+      focusedNode: null,
+      isEditSuccess: false,
+      isWriteAllowed: sessionStorage.getItem(ENVIRONMENT + 'roles') && sessionStorage.getItem(ENVIRONMENT + 'roles').indexOf('ui_write') > -1,
+      editInputFields: []
+    }
+  }
+  componentWillMount() {
+    console.log('Model gallery component will mount****');
+  }
+  componentWillUnmount() {
+    console.log('Model Gallery component will unmount****');
+  }
+  handleOnExpand = (row, isExpand, rowIndex, e) => {
+    console.log('handleOnExpand single Row...',row.id);
+    if (isExpand) {
+      this.setState(() => ({
+        expanded: [...this.state.expanded,row.id]
+      }));
+    } else {
+      this.setState(() => ({
+        expanded: this.state.expanded.filter(x => x !== row.id)
+      }),function () { this.forceUpdate(); }.bind(this));
+      
+    }
+  }
+  handleOnExpandAll = (isExpand, rows, e) => {
+    console.log('handleOnExpandAll to expand all rows');
+    var expandArr = [];    
+    if (isExpand) {
+      for(var r=0; r < rows.length; r++){
+        expandArr.push(rows[r].id);
+      }     
+    }
+    this.setState(() => ({
+      expanded: expandArr
+    }),function () { this.forceUpdate(); }.bind(this));
+    
+  } 
+  handleOnFilter = (colFilterList,nodeType,columns,value,aliasColumnList) =>{
+    console.log('handleOnFilter to Re-render',colFilterList);
+    var applyState = true;
+    if(value === ''){
+      Object.keys(colFilterList).forEach(function(pkey){
+        var filterList = colFilterList[pkey][0];
+        for(var j in filterList){
+          Object.keys(filterList[j]).forEach(function(key){         
+            if(filterList[j][key] !== ''){
+              applyState = false;
+            }
+          });
+        }        
+      });
+    }else{
+      applyState = false;
+    }  
+    this.setState({columnFilterList : colFilterList,rerender:true,columnsList : columns,nodeType: nodeType, disableFilter: applyState,aliasColumnList: aliasColumnList});    
+  } 
+  generateRegexForDsl= (nodeType) =>{
+    var nodePatternwithProp = nodeType+"\\*\\{.*?\\}\\(.*?\\)[\\,|\\>|\\]|\\)]|"+nodeType+"\\*\\(.*?\\)\\{.*?\\}[\\,|\\>|\\]|\\)]|"+nodeType+"\\{.*?\\}\\(.*?\\)[\\,|\\>|\\]|\\)]|"+nodeType+"\\(.*?\\)\\{.*?\\}[\\,|\\>|\\]|\\)]|"+nodeType+"\\{.*?\\}[\\,|\\>|\\]|\\)]|"+nodeType+"\\*\\{.*?\\}[\\,|\\>|\\]|\\)]";
+		return nodePatternwithProp;
+  }
+  /* Start Edit Node Modal Functions */
+  closeEditNodeModal = () =>{
+    this.setState({editErrMsg: null, editInfoMsg: null, showEditNodeModal:false});
+  }
+  submitEditNodeModal = () =>{
+    var payload = {"operations": []};
+    const settings = {
+      'NODESERVER': INVLIST.NODESERVER,
+      'PROXY': INVLIST.PROXY,
+      'PREFIX': INVLIST.PREFIX,
+      'VERSION': INVLIST.VERSION,
+      'USESTUBS': INVLIST.useStubs,
+      'APERTURE': INVLIST.APERTURE,
+      'APERTURE_SERVICENAME':INVLIST.APERTURE_SERVICENAME
+    };
+    let delimiter = '\/';
+    let start = 3;
+    if((this.state.focusedNode.url).indexOf("/aperture/v") > -1){
+        start = 4;
+    }
+    let tokens = (this.state.focusedNode.url).split(delimiter).slice(start);
+    let patchURL = tokens.join(delimiter);
+    var entry = {
+                    "action": "patch",
+                    "uri": patchURL,
+                    "body": {}
+                };
+    let path = "bulk/single-transaction";
+    this.setState({editErrMsg: null, isPatchLoading: true});
+    for(var key in this.state.editInputFields){
+        if(this.state.editInputFields[key].isEdited){
+            if(this.state.editInputFields[key].newValue !== ""){
+                entry.body[key] =  encodeURI(this.state.editInputFields[key].newValue);
+            }else{
+                entry.body[key] = null;
+            }
+        }
+    }
+    payload.operations.push(entry);
+    console.log('ModelGallery: settings:' + JSON.stringify(settings));
+    console.log('ModelGallery: path:' + path);
+    console.log('ModelGallery: payload:' + JSON.stringify(payload));
+    commonApi(settings, path, 'POST', payload, 'SingleTransactionEdit', null, null, null, true)
+    .then(res => {
+    	    console.log('ModelGallery: Response', Object.keys(res.data));
+            if(res.status === 201 || res.status === 200){
+                if(res.data["operation-responses"] && res.data["operation-responses"][0] && res.data["operation-responses"][0]["response-status-code"] === 200 ){
+                    this.setState({isEditSuccess: true, isPatchLoading: false, showEditNodeModal:false});
+                    GeneralCommonFunctions.scrollTo("editSuccessMessage");
+                }else{
+                    this.triggerError(res.data);
+                }
+            }else{
+               this.triggerError(res.data);
+            }
+    	}, error=>{
+    		this.triggerError(error);
+    	}).catch(error => {
+    		this.triggerError(error);
+    });
+  }
+  triggerError = (error) => {
+     console.error('[ModelGallery.jsx] error : ', JSON.stringify(error));
+     let errMsg = this.renderErrorMsg(error);
+     this.setState({
+           isPatchLoading: false,
+           isEditSuccess: false,
+           editErrMsg: errMsg
+       });
+  };
+  renderErrorMsg = (error) =>{
+      let errMsg='';
+        if (error.response) {
+            // The request was made and the server responded with a status code
+            // that falls out of the range of 2xx
+            console.log('[ModeGallery.jsx] error :', error.response);
+            if(error.response.status){
+                errMsg += " Code: " + error.response.status;
+            }
+            if(error.response.data){
+                errMsg += " - " + JSON.stringify(error.response.data);
+            }
+        } else if (error["requestError"]){
+            errMsg += JSON.stringify(error["requestError"]);
+        } else if (error.request) {
+            // The request was made but no response was received
+            // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
+            // http.ClientRequest in node.js
+            console.log(error.request);
+            errMsg += " - Request was made but no response received";
+        } else {
+            // Something happened in setting up the request that triggered an Error
+            console.log('Error', error.message);
+            errMsg += " - Unknown error occurred " + error.message;
+        }
+       return errMsg;
+  }
+  openEditNodeModal = (nodeKey) => {
+    console.log("ModelGallery :: openEditNodeModal called with " + nodeKey);
+    var focusedNode = null;
+    for (var i = 0; i < this.props.nodes.length && !focusedNode; i++){
+        if(nodeKey === this.props.nodes[i].url){
+            focusedNode = this.props.nodes[i];
+            break;
+        }
+    }
+    var editInputFields = [];
+    if(focusedNode){
+        var nodeType = focusedNode['node-type'];
+        focusedNode.allowedEditProps = [];
+        //call to check what props can be modified in oxm here;
+        focusedNode.allowedEditProps = GeneralCommonFunctions.getEditableAttributes(nodeType);
+        if(focusedNode.allowedEditProps.length > 0){
+            for (var key in focusedNode.allowedEditProps){
+                var attr = focusedNode.allowedEditProps[key];
+                editInputFields[attr] = {};
+                editInputFields[attr].isEdited = false;
+                if(focusedNode.properties[attr]){
+                    editInputFields[attr].oldValue = focusedNode.properties[attr];
+                    editInputFields[attr].newValue = focusedNode.properties[attr];
+                }else{
+                    editInputFields[attr].oldValue = "";
+                    editInputFields[attr].newValue = "";
+                }
+            }
+        }else{
+            this.setState({editInfoMsg: "This element cannot be edited, please contact an administrator if you need the ability to edit the attributes on this element."});
+        }
+    }else{
+        //could not find the node, this shouldn't happen
+        console.log("ModelGallery :: openEditNodeModal could not find " + nodeKey + " in this.props.nodes. This shouldn't happen.");
+    }
+
+    this.setState({showEditNodeModal:true, isEditSuccess: false, focusedNode: focusedNode, editInputFields: editInputFields});
+  }
+  handleInputChange(event) {
+    const target = event.target;
+    const value = target.type === 'checkbox' ? target.checked : target.value;
+    const name = target.name;
+    var editInputFields = this.state.editInputFields;
+    if(target.type === 'text'){
+        editInputFields[name].newValue = value;
+    }else if(target.type === 'checkbox'){
+        if(!value){
+            editInputFields[name].newValue =  editInputFields[name].oldValue,
+            editInputFields[name].isEdited = value
+        }else{
+            editInputFields[name].isEdited = value
+        }
+    }
+    this.setState({
+              editInputFields: editInputFields
+            });
+  }
+  /* End Edit Node Modal Functions */
+  render(){
+    let cards = null;
+    let tableColumns = [];
+    let tableValues = [];
+    let rowIndexValue = 0;
+    let svgWidth = window.outerWidth * 0.8;
+    let nodesList=[];
+    let tableColumnsList={};
+    let tableDataList={};
+    let columnFilter = [];
+    let columnFilterList = (this.state.rerender) ? this.state.columnFilterList : {};
+    let aliasColumnList=(this.state.rerender) ? this.state.aliasColumnList: {};
+    let aliasRegex=/\'(\s)as(\s)\'|\'as\'/ig;
+    console.log('Model gallery this.props>>>',this.props);
+    console.log('columnFilterList while rendering:',columnFilterList);
+    this.onTableFilterClick = (nodeType) => {
+      this.setState({rerender:false},function(){this.props.isTableFilterApply(this.state.columnFilterList,nodeType,this.state.columnsList,this.state.aliasColumnList);}.bind(this))
+    }
+    const expandRows = {
+      parentClassName: 'parent-expand-bar',
+      onlyOneExpanding: true,
+      renderer: (row, rowIndex) => (                    
+        <div>
+            <RelationshipList node={this.props.nodes[parseInt(row.id.split('_')[0])]}
+                key={this.props.nodes[parseInt(row.id.split('_')[0])].id}
+                nodeId={this.props.nodes[parseInt(row.id.split('_')[0])].id}
+                nodeType={this.props.nodes[parseInt(row.id.split('_')[0])]['node-type']}
+                nodeProps={this.props.nodes[parseInt(row.id.split('_')[0])].properties}
+                nodeRelatives={this.props.nodes[parseInt(row.id.split('_')[0])]['related-to']}
+                nodeUrl={this.props.nodes[parseInt(row.id.split('_')[0])].url}
+                historyStackString={this.props.historyStackString}
+                openHistoryModal={this.props.openHistoryModal}
+                openEditNodeModal={this.openEditNodeModal}
+                isWriteAllowed={this.state.isWriteAllowed}
+                rowIndex={parseInt(row.id.split('_')[0])}
+		enableRealTime={this.props.enableRealTime}
+                aliasColumnList={this.props.tableFilterAliasColumns}
+          />
+        </div>
+      ),
+      showExpandColumn: true,
+      expandByColumnOnly: true,     
+      onExpandAll: this.handleOnExpandAll,
+      expanded: this.state.expanded,
+      onExpand: this.handleOnExpand
+
+    };
+    const rowEvents = {
+      onClick: (e, row, rowIndex) => {
+        //row index is usefull when single node type exist, for multiple node type use row id
+        rowIndexValue = parseInt(row.id.split('_')[0]);        
+      },
+      onMouseEnter: (e, row, rowIndex) => {
+        //row index is usefull when single node type exist, for multiple node type use row id
+        rowIndexValue = parseInt(row.id.split('_')[0]);
+      }
+    };
+    let aliasColumns=[]
+    
+    if(this.props.nodes && this.props.nodes[0] && this.props.nodes[0]['node-type'] && this.props.viewName === "CellLayout" ){
+        for(var n=0; n<this.props.nodes.length; n++){
+          let nodeType = this.props.nodes[n]['node-type'];
+          let nodeTypeProperties =[];
+          let aliasProperties=[];
+          let plainNodes ='';
+          let dslQuery = this.props.dslQuery + ',';
+          if(this.props.dslQuery){
+            var nodePatternwithProp = this.generateRegexForDsl(nodeType);
+            var nodeRegularExp = new RegExp(nodePatternwithProp, 'g');
+            plainNodes = dslQuery.match(nodeRegularExp);
+            console.log('plainNodes model Gallery>>>>>*',plainNodes);
+            if(plainNodes){
+              let propertiesPattern ="\\{.*?\\}"; 
+              var propRegularExp = new RegExp(propertiesPattern, 'g');
+              let nodeTypeProp = plainNodes[0].match(propRegularExp);
+              nodeTypeProp = nodeTypeProp[0].slice(1,-1).split(',');//.replace(/\'/g,'').toLowerCase().split(',');
+              for(var s=0;s<nodeTypeProp.length;s++){
+                let nodeTypePropes=nodeTypeProp[s].match(aliasRegex);
+                let alias='';
+                let nprop='';
+                if(nodeTypePropes){
+                  let nodeTypeSplit=nodeTypeProp[s].split(aliasRegex);
+                  nprop=nodeTypeSplit[0].replace(/\'/g,'');                  
+                  alias=nodeTypeSplit[nodeTypeSplit.length-1].replace(/\'/g,'');                 
+                }else{
+                  nprop=nodeTypeProp[s].replace(/\'/g,'').toLowerCase();
+                } 
+                aliasProperties.push(alias);
+                nodeTypeProperties.push(nprop);
+              }             
+            }  
+          }
+          if(nodesList.indexOf(nodeType) === -1){
+            tableColumns=[];
+            tableValues=[];
+            nodesList.push(nodeType);            
+            let tableColumnsBuilt = ExportExcel.buildAttrList(nodeType,[],'required');
+            if(this.props.dslQuery && plainNodes){
+              for(var z=0;z<tableColumnsBuilt.length;z++){ 
+                let index= nodeTypeProperties.indexOf(tableColumnsBuilt[z].value.toLowerCase());         
+                if(index !== -1){
+                  if(aliasProperties[index] !==''){
+                    let objAlias = {};
+                    objAlias[aliasProperties[index]]=nodeTypeProperties[index];
+                    aliasColumns.push(objAlias);
+                    tableColumnsBuilt[z].value=aliasProperties[index];                   
+                  }
+                  tableColumns.push(tableColumnsBuilt[z]);                                    
+                }
+              }
+            }else{
+              tableColumns=tableColumnsBuilt;
+            }
+            console.log('after condition table columns>>>>',tableColumns);
+            tableColumns.push({value:'id'});
+            if(!columnFilterList[nodeType]){             
+              columnFilterList[nodeType] = [];
+              columnFilter = [];
+              for(var j = 0; j < tableColumns.length; j++){
+                let txt = tableColumns[j].value;
+                //if(!this.state.reRender && (!columnFilter[j] || (columnFilter[j] && columnFilter[j][txt] === undefined))){                
+                  let obj = {};
+                  obj[txt] = '';
+                  obj['description'] = tableColumns[j].description;
+                  columnFilter.push(obj);
+                //}              
+              }
+              columnFilterList[nodeType].push(columnFilter); 
+            }
+            if(!aliasColumnList[nodeType]){   
+              aliasColumnList[nodeType]=[]; 
+              aliasColumnList[nodeType].push(aliasColumns);      
+            }                 
+            for(var j = 0; j < tableColumns.length; j++){                                         
+              if(j === tableColumns.length-1){
+                tableColumns[j].dataField = 'id';
+                tableColumns[j].hidden = true;
+                tableColumns[j].text = tableColumns[j].value;
+              }else{
+                tableColumns[j].dataField = tableColumns[j].value;
+                tableColumns[j].text = tableColumns[j].value;
+                tableColumns[j].headerAttrs= { title:tableColumns[j].description};
+                tableColumns[j].ref=tableColumns[j].value;
+                tableColumns[j].filter = customFilter();
+                tableColumns[j].filterRenderer = (onFilter, column) => <AttributeFilter handleOnFilter= {this.handleOnFilter} onFilter={ onFilter } column={ column } isPageChange={this.props.isPageNumberChange} nodeType={nodeType} columnFilterList={columnFilterList} columns={tableColumnsList} aliasColumnList={aliasColumnList}/>;
+              }
+            }
+            tableColumnsList[nodeType] = tableColumns;
+            tableDataList[nodeType] = [];            
+            for(var m=0; m<this.props.nodes.length; m++){
+              let nodeTypeForData = this.props.nodes[m]['node-type'];
+              if(nodeTypeForData === nodeType){
+                let propertiesOfNode = this.props.nodes[m].properties; 
+                propertiesOfNode.id = m + '_' + nodeType + '_id';         
+                tableValues.push(propertiesOfNode);     
+                tableDataList[nodeType].push(tableValues);  
+              }
+            }
+          }                 
+        }
+    }else{
+      cards = this.props.nodes.map(node => {
+        return (
+           <Col key={node.id} lg={3} md={3} sm={6} xs={12}>
+                <ModelCard
+                  key={node.id}
+                  nodeId={node.id}
+                  nodeType={node['node-type']}
+                  nodeProps={node.properties}
+                  nodeRelatives={node['related-to']}
+                  nodeUrl={node.url}
+                  historyStackString={this.props.historyStackString}
+                  openHistoryModal={this.props.openHistoryModal}
+                  openEditNodeModal={this.openEditNodeModal}
+                  isWriteAllowed={this.state.isWriteAllowed}
+                  enableRealTime={this.props.enableRealTime}
+                  aliasColumnList={this.props.tableFilterAliasColumns}/>
+            </Col>
+        );
+      });
+    }
+    let tabs=nodesList.map((nodeType,index) => {
+      return(
+        <Tab eventKey={nodeType} title={nodeType} key={nodeType}>
+          <BootstrapTable
+              id={nodeType}
+              keyField='id'
+              data={tableDataList[nodeType][0]}
+              columns={tableColumnsList[nodeType]}
+              filter={filterFactory()}
+              bordered={true}
+              columnFilter={true}
+              headerClasses='table-header-view'
+              expandRow={expandRows}
+              rowEvents={rowEvents}
+              bootstrap4 striped hover condensed
+          />
+        </Tab>
+      )
+    });
+    return (
+      <div>
+       <div className={'addPaddingTop alert alert-success ' +(this.state.isEditSuccess ? 'show' : 'hidden')} id="editSuccessMessage" role="alert">
+         Update made successfully to {this.state.focusedNode ? this.state.focusedNode.url : ""}. If you wish, you may check your update using a real-time mode query, it may take some time to reflect in analysis mode.
+       </div>
+	   <div className='static-modal'>
+	   		<Modal show={this.state.showEditNodeModal} onHide={this.closeEditNodeModal}>
+	   			<Modal.Header>
+	   				<Modal.Title>Edit Element</Modal.Title>
+	   			</Modal.Header>
+	   			<Modal.Body>
+	   			    <Spinner loading={this.state.isPatchLoading}>
+	   			        <div className={'addPaddingTop alert alert-danger ' +(this.state.editErrMsg && this.state.editErrMsg !== '' ? 'show' : 'hidden')} id="editErrorMessage" role="alert">
+                          An error occurred in editing the element. Please see details {this.state.editErrMsg}
+                        </div>
+                        <div className={'addPaddingTop alert alert-info ' +(this.state.editInfoMsg && this.state.editInfoMsg !== '' ? 'show' : 'hidden')} id="editNotAllowedMessage" role="alert">
+                          {this.state.editInfoMsg}
+                        </div>
+	   			        <form>
+	   			        {this.state.focusedNode && Object.keys(this.state.editInputFields).length > 0 && (this.state.focusedNode.allowedEditProps).sort().map((attr) => {
+                            return <div class="form-group row">
+                                       <div className="col-sm-3">
+                                            <label for={attr} class="col-form-label">{attr}</label>
+                                       </div>
+                                       <div class="col-sm-1">
+                                            <div className="checkbox">
+                                               <input type="checkbox" name={attr} checked={this.state.editInputFields[attr].isEdited} onChange={this.handleInputChange.bind(this)} />
+                                            </div>
+                                       </div>
+                                       <div class="col-sm-8">
+                                         <input type="text" class="form-control" id={attr} name={attr} disabled={!this.state.editInputFields[attr].isEdited} onChange={this.handleInputChange.bind(this)} value={this.state.editInputFields[attr].newValue}/>
+                                       </div>
+                                     </div>;
+
+                         })
+                        }
+                        </form>
+                    </Spinner>
+	   			</Modal.Body>
+	   			<Modal.Footer>
+	   				<Button onClick={this.closeEditNodeModal}>Close</Button>
+	   				<Button className={this.state.editInfoMsg && this.state.editInfoMsg !== '' ? 'hidden' : ''} onClick={this.submitEditNodeModal}>Submit</Button>
+	   			</Modal.Footer>
+	   		</Modal>
+       </div>
+      {(() => {
+              if (this.props.viewName === "CellLayout" && tableValues.length > 0) {
+                if(nodesList.length > 1){
+                  if(this.props.isTableFilterApply){
+                    return (
+                      <div className="addPaddingSide">
+                        <button type='button' className={(this.state.disableFilter)? 'btn btn-outline-secondary' : 'btn btn-primary'} disabled={this.state.disableFilter} onClick={() => {this.onTableFilterClick(nodesList)}} style={{float: 'right', margin: '2px'}}>Apply Filters (All)</button>
+                        <Tabs defaultActiveKey={nodesList[0]} id="multipleTabularView">
+                          {tabs}
+                        </Tabs>
+                      </div>
+                    )
+                  }else{
+                    return (
+                      <div className="addPaddingSide">
+                        <Tabs defaultActiveKey={nodesList[0]} id="multipleTabularView">
+                          {tabs}
+                        </Tabs>
+                      </div>
+                    )
+                  }                
+                }else{
+                  if(this.props.isTableFilterApply){
+                    return(
+                      <div className="addPaddingSide">
+                        <button type='button' className={(this.state.disableFilter)? 'btn btn-outline-secondary' : 'btn btn-primary'} disabled={this.state.disableFilter} onClick={() => {this.onTableFilterClick(this.state.nodeType)}} style={{float: 'right', margin: '10px'}}>Apply Filters (All)</button>
+                        <BootstrapTable
+                          id='modelGallery'
+                          keyField='id'
+                          data={ tableValues }
+                          columns={ tableColumns }
+                          filter={ filterFactory() }
+                          bordered={ true }
+                          columnFilter={ true }
+                          headerClasses='table-header-view'
+                          expandRow={ expandRows }
+                          rowEvents={ rowEvents }
+                          bootstrap4 striped hover condensed
+                        />
+                      </div>
+                    )
+                  }else{
+                    return (
+                      <div className="addPaddingSide">
+                        <BootstrapTable
+                          id='modelGallery'
+                          keyField='id'
+                          data={ tableValues }
+                          columns={ tableColumns }
+                          filter={ filterFactory() }
+                          bordered={ true }
+                          columnFilter={ true }
+                          headerClasses='table-header-view'
+                          expandRow={ expandRows }
+                          rowEvents={ rowEvents }
+                          bootstrap4 striped hover condensed
+                        />
+                      </div>
+                    )
+                  }                  
+                }
+              } else if (this.props.viewName === "CardLayout") {
+                return (
+                  <Grid fluid={true}>
+                          <Row className='show-grid'>
+                            {cards}
+                          </Row>
+                  </Grid>
+                )
+            }
+           })()}
+            <div className={this.props.viewName === "VisualLayout" ? 'show' : 'hidden'}>
+                <OutputVisualization identifier="currentState" width={svgWidth} height="1200" overflow="scroll"/>
+            </div>
+      </div>
+    );
+  } 
+};
+
+export default ModelGallery;
diff --git a/src/app/model/modelSearch/components/ModelNodeCard.jsx b/src/app/model/modelSearch/components/ModelNodeCard.jsx
new file mode 100644
index 0000000..0caf831
--- /dev/null
+++ b/src/app/model/modelSearch/components/ModelNodeCard.jsx
@@ -0,0 +1,51 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React from 'react';
+import ModelRelationships from './ModelRelationships.jsx';
+import Col from 'react-bootstrap/lib/Col';
+
+const modelNodeCard = (props) => {
+
+  console.log('[Model Node Card] props : ', props);
+  const properties = Object.keys(props.nodeProps).map( (prop, idx) => {
+    return (
+      <p key={idx}><strong> {prop} : </strong> { props.nodeProps[prop].toString()} </p>
+    );
+  });
+
+  return (
+    <Col lg={8} md={8} sm={10}>
+      <div className='card model-card'>
+        <div className='card-header'>
+          Node {props.nodeId}
+        </div>
+        <div className='card-content model-card-content'>
+          {properties}
+        </div>
+      </div>
+      <ModelRelationships relatives={props}/>
+    </Col>
+  );
+};
+
+export default modelNodeCard;
+
+
diff --git a/src/app/model/modelSearch/components/ModelNodeGallery.jsx b/src/app/model/modelSearch/components/ModelNodeGallery.jsx
new file mode 100644
index 0000000..ef6947e
--- /dev/null
+++ b/src/app/model/modelSearch/components/ModelNodeGallery.jsx
@@ -0,0 +1,46 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React from 'react';
+import ModelNodeCard from './ModelNodeCard.jsx';
+
+const modelNodeGallery = (props) => {
+
+  const cards = props.nodes.map(node => {
+    console.log('[Model Node Gallery] : ', node);
+    return (
+      <ModelNodeCard
+        key={node.id}
+        nodeId={node.id}
+        nodeType={node['node-type']}
+        nodeProps={node.properties}
+        nodeRelatives={node['related-to']}
+        nodeUrl={node.url}/>
+    );
+  });
+
+  return (
+    <div>
+      {cards}
+    </div>
+  );
+};
+
+export default modelNodeGallery;
diff --git a/src/app/model/modelSearch/components/ModelRelationships.jsx b/src/app/model/modelSearch/components/ModelRelationships.jsx
new file mode 100644
index 0000000..8dec154
--- /dev/null
+++ b/src/app/model/modelSearch/components/ModelRelationships.jsx
@@ -0,0 +1,137 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
+import Label from 'react-bootstrap/lib/Label';
+import Panel from 'react-bootstrap/lib/Panel';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+import {ExportExcel} from 'utils/ExportExcel.js';
+let buildAttrList = ExportExcel.buildAttrList;
+
+let INVLIST = GlobalExtConstants.INVLIST;
+
+class ModelRelationships extends Component {
+  constructor(props){
+      console.log(props);
+      super(props);
+      this.props = props;
+  }
+
+  render(){
+  console.log('[ModelRelationships.jsx] props : ', this.props);
+  let relationships = null;
+  let navigateByoq = null;
+  let relativesArray = [];
+  this.nodeDisplay = this.props.relatives.nodeType + ' : ' + (this.props.relatives.nodeUrl).split(this.props.relatives.nodeType + '\/').pop();
+  this.historyClick = () => {
+    this.props.openHistoryModal(this.nodeDisplay, this.props.relatives.nodeUrl,this.props.relatives.nodeType);
+  }
+
+  if (this.props.relatives.nodeRelatives && this.props.relatives.nodeRelatives.length > 0) {
+    relationships = this.props.relatives.nodeRelatives.sort(function(a, b) {
+                                                   var compareA = (a['node-type'] + (a.url).split(a['node-type']+'\/').pop()).toLowerCase();
+                                                   var compareB = (b['node-type'] + (b.url).split(a['node-type']+'\/').pop()).toLowerCase();
+                                                   if(compareA < compareB) return -1;
+                                                   if(compareA > compareB) return 1;
+                                                   return 0;
+                                                  }).map((relative, idx) => {
+                                                  if (relativesArray.includes(relative['node-type']) === false) relativesArray.push(relative['node-type']);
+      return (
+        <div>
+          <Link
+            key={idx}
+            to={{
+              pathname: '/model/' + relative['node-type'] + '/' + relative.id + '/'+  this.props.relatives.enableRealTime,
+              uri: relative.url,
+              historyStackString: this.props.historyStackString
+            }}>
+            {relative['node-type']}: {(decodeURI((relative.url).split(relative['node-type']+'\/').pop())).replace(/%2F/g,'/')}</Link> <Label bsStyle='default'>{relative['relationship-label'].slice(33)}</Label>
+        </div>
+      );
+    });
+  }
+    relativesArray = relativesArray.join('&');
+    var propKey = '';
+    var requiredParams = buildAttrList(this.props.relatives.nodeType,[],'mandatory');
+    var aliasColumnFilters = (this.props.relatives.aliasColumnList && this.props.relatives.aliasColumnList[this.props.relatives.nodeType])?this.props.relatives.aliasColumnList[this.props.relatives.nodeType][0]:[];
+    console.log('requiredParams>>>>>>>>>>>>',requiredParams);
+    Object.keys(this.props.relatives.nodeProps).map((prop, idx) => {           
+      for(var a in requiredParams){        
+        let alias='';
+        if(aliasColumnFilters && aliasColumnFilters[requiredParams[a].value]){
+          alias=requiredParams[a].value;
+          requiredParams[a].value=aliasColumnFilters[requiredParams[a].value];          
+        }
+        if(requiredParams[a].value === prop){
+          let tag= (alias!='')? alias: prop;
+          if(propKey === ''){
+            propKey = tag + ':' + btoa('<pre>' + this.props.relatives.nodeProps[prop].toString() + '</pre>');
+          }else{
+            propKey = propKey + ';' + tag + ':' + btoa('<pre>' + this.props.relatives.nodeProps[prop].toString() + '</pre>');
+          }        
+        }
+      }
+    });
+    let pathNameStr = (relativesArray.length>0) ? '/customDsl/' + this.props.relatives.nodeType + '/' + propKey + '/' + relativesArray : '/customDsl/' + this.props.relatives.nodeType + '/' + propKey;
+    navigateByoq = <Link
+                    to={{
+                      pathname: pathNameStr
+                     }}>
+                     <button type='button' className='btn btn-primary pull-right'>>>BYOQ</button>
+                   </Link>;
+  if (this.props.relatives.nodeRelatives && this.props.relatives.nodeRelatives.length > 0) {
+    return (
+      <Panel>
+        <Panel.Heading>
+          <Panel.Toggle>
+            <button type='button' className='btn btn-outline-primary'>
+              Relationships
+              </button>
+          </Panel.Toggle>
+            { INVLIST.isHistoryEnabled && (<button type='button' className='btn btn-outline-primary' onClick={this.historyClick}>
+              History
+            </button>)}
+            {navigateByoq}
+        </Panel.Heading>
+        <Panel.Collapse>
+          <Panel.Body className='cardwrap'>
+            {relationships}
+          </Panel.Body>
+        </Panel.Collapse>
+      </Panel>
+    );
+  } else {
+    return (
+      <div>
+        <button type='button' className='btn btn-outline-disabled'>
+          No relationships
+        </button>
+        { INVLIST.isHistoryEnabled && (<button type='button' className='btn btn-outline-primary' onClick={this.historyClick}>
+          History
+        </button>)}
+        {navigateByoq}
+      </div>
+    );
+  }
+}
+};
+
+export default ModelRelationships;
diff --git a/src/app/model/modelSearch/components/ModelTabularView.jsx b/src/app/model/modelSearch/components/ModelTabularView.jsx
new file mode 100644
index 0000000..3b5a94a
--- /dev/null
+++ b/src/app/model/modelSearch/components/ModelTabularView.jsx
@@ -0,0 +1,197 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, { Component } from 'react';
+import BootstrapTable from 'react-bootstrap-table-next';
+import filterFactory, { textFilter, customFilter } from 'react-bootstrap-table2-filter';
+import PropTypes from 'prop-types';
+import { Link } from 'react-router-dom';
+import Label from 'react-bootstrap/lib/Label';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+import {ExportExcel} from 'utils/ExportExcel.js';
+let buildAttrList = ExportExcel.buildAttrList;
+
+let INVLIST = GlobalExtConstants.INVLIST;
+
+  class RelationshipList extends Component {
+
+	
+	constructor(props) {
+	  super(props);
+	  this.props = props;
+	  this.relationships = null;
+	  this.relativesArray = [];
+	  this.state = {
+		  filteron:false
+
+	  }
+	}
+	render() {
+
+
+	  let navigateByoq = null;
+	  this.nodeDisplay = this.props.nodeType + ' : ' + (this.props.nodeUrl).split(this.props.nodeType + '\/').pop();
+	  this.historyClick = () => {
+		this.props.openHistoryModal(this.nodeDisplay, this.props.nodeUrl,this.props.nodeType);
+	  }
+	  this.filter = (e) =>{
+			let filterValue = e.target.value;
+			this.returnFilterList(filterValue);
+			this.setState({filteron:true});
+	  }
+	  this.returnFilterList = (filterValue) =>{
+	  if (this.props.nodeRelatives && this.props.nodeRelatives.length > 0) {
+		this.relationships = null;	
+		this.relationships = this.props.nodeRelatives.sort(function(a, b) {
+													   var compareA = (a['node-type'] + (a.url).split(a['node-type']+'\/').pop()).toLowerCase();
+													   var compareB = (b['node-type'] + (b.url).split(a['node-type']+'\/').pop()).toLowerCase();
+													   if(compareA < compareB) return -1;
+													   if(compareA > compareB) return 1;
+													   return 0;
+													  }).map((relative, idx) => {
+													  if (this.relativesArray.includes(relative['node-type']) === false) this.relativesArray.push(relative['node-type']);
+													  if(filterValue === '' || filterValue === ':' || relative['node-type'].toLowerCase().search(filterValue.toLowerCase()) != -1 || (decodeURI((relative.url).split(relative['node-type']+'\/').pop())).replace(/%2F/g,'/').toLowerCase().search(filterValue.toLowerCase()) != -1){
+		  return (
+		  	<li key={idx + '' +relative.id}>
+			  <Link
+				key={idx}
+				to={{
+				  pathname: '/model/' + relative['node-type'] + '/' + relative.id + '/'+ this.props.enableRealTime,
+				  uri: relative.url,
+				  historyStackString: this.props.historyStackString
+				}}>
+						{relative['node-type']}: {(decodeURI((relative.url).split(relative['node-type']+'\/').pop())).replace(/%2F/g,'/')}</Link> <Label bsStyle='default'>{relative['relationship-label'].slice(33)}</Label>
+					</li>			
+		  );
+				}
+		});
+	  }
+		}		
+		if(!this.state.filteron){
+			this.returnFilterList('');
+		}		
+		let relativesArray = (this.relativesArray.length > 0) ? this.relativesArray.join('&') : this.relativesArray;
+		var propKey = '';
+			var requiredParams = buildAttrList(this.props.nodeType,[],'mandatory');
+			var aliasColumnFilters = (this.props.aliasColumnList && this.props.aliasColumnList[this.props.nodeType])?this.props.aliasColumnList[this.props.nodeType][0]:[];
+      Object.keys(this.props.nodeProps).map((prop, idx) => {      
+	      for(var a in requiredParams){
+					let alias='';
+					if(aliasColumnFilters && aliasColumnFilters[requiredParams[a].value]){
+						alias=requiredParams[a].value;
+						requiredParams[a].value=aliasColumnFilters[requiredParams[a].value];						
+					}
+	        if(requiredParams[a].value === prop){
+						let tag= (alias!='')? alias: prop;
+	          if(propKey === ''){
+	            propKey =  tag + ':' + btoa(this.props.nodeProps[prop].toString());
+	          }else{
+	            propKey = propKey + ';' + tag + ':' + btoa(this.props.nodeProps[prop].toString());
+	          }        
+	        }
+	      }
+	    });
+	    let editModalIcon = <a className={this.props.isWriteAllowed ? 'show' : 'hidden'} onClick={e => {this.props.openEditNodeModal(this.props.nodeUrl)}}><i style={{cursor: 'pointer'}} className="pull-right fa fa-pencil-square-o" aria-hidden="true"></i></a>;
+	    let pathNameStr = (relativesArray.length>0) ? '/customDsl/' + this.props.nodeType + '/' + propKey + '/' + relativesArray : '/customDsl/' + this.props.nodeType + '/' + propKey;
+	    navigateByoq = <Link
+	                    to={{
+	                      pathname: pathNameStr
+	                     }}>
+	                     <button type='button' className='btn btn-primary pull-right'>>>BYOQ</button>
+	                   </Link>;
+	  let relationships = [];
+	  if(this.relationships){
+	  	for(var n=0 ; n < this.relationships.length ; n++){
+		  if(this.relationships[n]){
+			relationships.push(this.relationships[n]);
+		  }
+		}
+	  }	
+	  if (this.props.nodeRelatives && this.props.nodeRelatives.length > 0) {
+		return (
+		  <div>
+			<div style={{float: 'left'}}>
+				<table className='relationshipTable table-striped table-hover table-bordered table-sm'>
+					<thead>
+						<tr className='table-header-view'>
+							<th titlename='Relationships'>
+								Relationships
+								<div>
+									<input
+										key='input'
+										type='text'
+										placeholder='Enter Relationship...'  
+										onChange={(e) => this.filter(e)}      
+					  />
+								</div>
+							</th>
+						</tr>
+					</thead>
+					<tbody>
+					<tr>
+						<td>
+							<ul>
+								{relationships}
+							</ul>
+						</td>
+					</tr>
+					</tbody>
+				</table>
+			</div>
+			<div style={{float: 'left', margin: '10px'}}>
+				{ INVLIST.isHistoryEnabled && (<button type='button' className='btn btn-primary pull-right' onClick={this.historyClick}>
+					History
+				  </button>)}
+			</div>
+			<div style={{float: 'left',margin: '10px'}}>
+				{navigateByoq}
+			</div>
+			<div style={{float: 'left',margin: '10px'}}>
+            	{editModalIcon}
+            </div>
+		  </div>
+		)
+	  } else {
+		return (
+		  <div>
+		  	<div style={{float: 'left', margin: '10px'}}>
+				<button type='button' className='btn btn-outline-disabled'>
+				  No relationships
+				</button>
+			</div>
+			<div style={{float: 'left', margin: '10px'}}>
+				{ INVLIST.isHistoryEnabled && (<button type='button' className='btn btn-primary' onClick={this.historyClick}>
+				  History
+				</button>)}
+			</div>
+			<div style={{float: 'left', margin: '10px'}}>
+				{navigateByoq}
+		  	</div>
+		  	<div style={{float: 'left',margin: '10px'}}>
+            	{editModalIcon}
+            </div>
+		  </div>
+		);
+	  }
+	}
+  }
+
+export default RelationshipList;
+//export default AttributeFilter;
diff --git a/src/app/model/test.jsx b/src/app/model/test.jsx
new file mode 100644
index 0000000..69ca45e
--- /dev/null
+++ b/src/app/model/test.jsx
@@ -0,0 +1,147 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+const languages = [
+  {
+	name: 'C',
+	year: 1972
+  },
+  {
+	name: 'C#',
+	year: 2000
+  },
+  {
+	name: 'C++',
+	year: 1983
+  },
+  {
+	name: 'Clojure',
+	year: 2007
+  },
+  {
+	name: 'Elm',
+	year: 2012
+  },
+  {
+	name: 'Go',
+	year: 2009
+  },
+  {
+	name: 'Haskell',
+	year: 1990
+  },
+  {
+	name: 'Java',
+	year: 1995
+  },
+  {
+	name: 'Javascript',
+	year: 1995
+  },
+  {
+	name: 'Perl',
+	year: 1987
+  },
+  {
+	name: 'PHP',
+	year: 1995
+  },
+  {
+	name: 'Python',
+	year: 1991
+  },
+  {
+	name: 'Ruby',
+	year: 1995
+  },
+  {
+	name: 'Scala',
+	year: 2003
+  }
+];
+
+// https://developer.mozilla.org/en/docs/Web/JavaScript/Guide/Regular_Expressions#Using_Special_Characters
+function escapeRegexCharacters(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function getSuggestions(value) {
+  const escapedValue = escapeRegexCharacters(value.trim());
+
+  const regex = new RegExp('^' + escapedValue, 'i');
+
+  return languages.filter(language => regex.test(language.name));
+}
+
+function getSuggestionValue(suggestion) {
+  return suggestion.name;
+}
+
+function renderSuggestion(suggestion) {
+  return (
+	<span>{suggestion.name}</span>
+  );
+}
+
+class Test extends React.Component {
+  constructor() {
+	super();
+
+	this.state = {
+	  value: '',
+	  suggestions: getSuggestions('')
+	};
+
+	this.onChange = this.onChange.bind(this);
+	this.onSuggestionsUpdateRequested = this.onSuggestionsUpdateRequested.bind(this);
+  }
+
+  onChange(event, { newValue, method }) {
+	this.setState({
+	  value: newValue
+	});
+  }
+
+  onSuggestionsUpdateRequested({ value }) {
+	this.setState({
+	  suggestions: getSuggestions(value)
+	});
+  }
+
+  render() {
+	const { value, suggestions } = this.state;
+	const inputProps = {
+	  placeholder: "Type 'c'",
+	  value,
+	  onChange: this.onChange
+	};
+
+	return (
+	  <Autosuggest suggestions={suggestions}
+				   onSuggestionsUpdateRequested={this.onSuggestionsUpdateRequested}
+				   shouldRenderSuggestions={() => true}
+				   getSuggestionValue={getSuggestionValue}
+				   renderSuggestion={renderSuggestion}
+				   inputProps={inputProps} />
+	);
+  }
+}
+
+ReactDOM.render(<App />, document.getElementById('app'));
diff --git a/src/app/model/testGallery.jsx b/src/app/model/testGallery.jsx
new file mode 100644
index 0000000..8d73388
--- /dev/null
+++ b/src/app/model/testGallery.jsx
@@ -0,0 +1,91 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, {Component} from 'react';
+import ModelGallery from 'app/modelSearch/components/ModelGallery.jsx';
+import testData from 'app/CustomQueryMultiNode';
+
+class testGallery extends Component {
+
+  state = {
+    nodes: [],
+    multipleNodes: '',
+    isLoading: 'show'
+  }
+
+  componentWillMount () {
+    this.processData(testData);
+  }
+
+
+
+  processData = (data) => {
+    console.log('Response data' + JSON.stringify(data));
+    if (data && data.results) {
+      //this.nodes = data.results;
+      this.setState({
+        nodes: data.results
+      });
+
+      this.multipleNodes = this.state.nodes.length > 1;
+    }
+    if (data && data.headers && data.headers.get('total-results')) {
+      this.modelService.setTotalResults(data.headers.get('total-results'));
+    }
+    this.setState({
+      isLoading: 'hidden'
+    });
+  }
+
+  render() {
+
+    let nodes = '';
+    if ( this.state.nodes.length > 0 ) {
+
+      console.log('nodes exist');
+
+      nodes =
+        (<div className='model-container'>
+          <ModelGallery
+            nodes={this.state.nodes}/>
+        </div>);
+    }
+
+    return(
+      <div className='multipleNodes'>
+        <div className={!this.state.isLoading}>
+          <div className='col align-self-cemter'>
+            <fa name='cog' className='fa-5x fa-spin'></fa>
+          </div>
+        </div>
+        <div className={!this.state.isLoading}>
+          <h2>{this.header}</h2>
+          <div className='nodes container-fluid'>
+            <div className='row-dsl'>
+              {nodes}
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default testGallery;
diff --git a/src/app/modifications/Modifications.jsx b/src/app/modifications/Modifications.jsx
new file mode 100644
index 0000000..f9837e7
--- /dev/null
+++ b/src/app/modifications/Modifications.jsx
@@ -0,0 +1,190 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, {Component} from 'react';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+import Col from 'react-bootstrap/lib/Col';
+import Row from 'react-bootstrap/lib/Row';
+import Grid from 'react-bootstrap/lib/Grid';
+import Panel from 'react-bootstrap/lib/Panel';
+import * as Excel from 'exceljs/dist/exceljs.min.js';
+import Spinner from 'utils/SpinnerContainer.jsx';
+
+let INVLIST = GlobalExtConstants.INVLIST;
+let OXM = GlobalExtConstants.OXM;
+
+let invList = null;
+
+class Modifications extends Component {
+
+  state = {
+            file:null,
+            enableBusyFeedback: false,
+            enableUploadFeedback: false,
+            showResults: false,
+            errorResults: true
+          };
+
+  constructor(){
+    super();
+  }
+  componentDidMount(){
+  };
+  addValidationError = (baseString, sheetName, row, validationError) => {
+    return baseString += 'Error occurred on worksheet ' + sheetName + ' at Row ' + row + ' '
+            + validationError + '\n';
+  }
+  uploadedFile = (e) => {
+      this.setState({enableUploadFeedback: true,enableBusyFeedback:false,showResults:false,errorResults:false});
+      let reader = new FileReader();
+      let file = e.target.files[0];
+      let wb = new Excel.Workbook();
+      var columnHeaders = [];
+      var jsonPayload = [];
+      reader.onload= () => {
+            const buffer = reader.result;
+            var validationErrors = {};
+                wb.xlsx.load(buffer).then(workbook => {
+                  workbook.eachSheet(function(worksheet, sheetId) {
+                                      worksheet.eachRow({ includeEmpty: true }, function(row, rowNumber) {
+                                      if(rowNumber === 1){
+                                        for(var j = 1;j <= row.values.length; j++){
+                                            columnHeaders[sheetId + '-' + j ] = row.values[j];
+                                        }
+                                      }else{
+                                        var obj = {};
+                                        obj.properties = {};
+                                        obj['node-type'] = worksheet.name;
+                                        for(var j = 1;j <= row.values.length; j++){
+                                            if(['uri','action'].indexOf(columnHeaders[sheetId + '-' + j ]) > -1){
+                                                obj[columnHeaders[sheetId + '-' + j ]] = row.values[j];
+                                                if(!row.values[j] || row.values[j] === ""){
+
+                                                }else if (columnHeaders[sheetId + '-' + j ] === 'action'
+                                                    && ['DELETE','UPDATE', 'ADD'].indexOf((row.values[j]).toUpperCase()) === -1 ){
+                                                    validationErrors = this.addValidationError(validationErrors,
+                                                        worksheet.name, j, 'Action needs to be DELETE, UPDATE, or ADD');
+                                                }
+                                            }else if(columnHeaders[sheetId + '-' + j ] !== 'relationship-list'){
+                                                obj.properties[columnHeaders[sheetId + '-' + j ]] = row.values[j];
+                                            }
+                                        }
+                                        jsonPayload.push(obj);
+                                      }
+                                      console.log("Row " + rowNumber + " = " + JSON.stringify(row.values));
+                                      });
+                       console.log(JSON.stringify(jsonPayload));
+                  });
+                  this.setState({enableUploadFeedback: false});
+                });
+
+      }
+      if((file.name).endsWith(".xls") || (file.name).endsWith(".xlsx")){
+        reader.readAsArrayBuffer(file);
+      }else{
+        var error = {};
+        error.validationMsg =  "Please upload a valid file, valid files are .xslx and .xsl only."
+        triggerError(error);
+        this.setState({enableUploadFeedback: false});
+      }
+  }
+  onFileSubmit = () => {
+    this.setState({enableBusyFeedback:true,showResults:false,errorResults:false});
+  }
+  triggerError = (error) => {
+     console.error('[Modifications.jsx] error : ', JSON.stringify(error));
+     this.setState({
+            enableBusyFeedback: false,
+         	showResults: false,
+         	errorResults: true
+       });
+      let errMsg = '';
+      if(error.validationMsg){
+        errMsg = error.validationMsg;
+      } else if (error.response) {
+        // The request was made and the server responded with a status code
+        // that falls out of the range of 2xx
+        console.log(error.response.data);
+        console.log(error.response.status);
+        console.log(error.response.headers);
+        if(error.response.status){
+            errMsg += " Code: " + error.response.status;
+        }
+   	    if(error.response.data){
+            errMsg += " - " + JSON.stringify(error.response.data);
+        }
+      } else if (error.request) {
+        // The request was made but no response was received
+        // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
+        // http.ClientRequest in node.js
+        console.log(error.request);
+        errMsg += " - Request was made but no response received";
+      } else {
+        // Something happened in setting up the request that triggered an Error
+        console.log('Error', error.message);
+        errMsg += " - Unknown error occurred " + error.message;
+      }
+      //Suppress Error Message when 404 results not found occur
+      if(error.response && error.response.status === 404){
+           this.setState({errorMessage:'', errorResults:false});
+      }else{
+           this.setState({errorMessage:errMsg});
+      }
+   }
+  render = () => {
+    return(
+      <div>
+          <div id='modifications'>
+                <header className='addPadding jumbotron my-4'>
+                    <h1 className='display-2'>Modifications Page</h1>
+                    <p className='lead'>
+                      On this page you have the ability to make modifications to the data by uploading a xslx.
+                    </p>
+                </header>
+                <Grid fluid={true} className='model-container'>
+                    <Spinner loading={this.state.enableUploadFeedback}>
+                        <Row>
+                            <form className="addPadding" onSubmit={this.onFileSubmit}>
+                                  <div className="row justify-content-center mb-2">
+                                       <input onChange={this.uploadedFile} type="file" id="excelFile" accept=".xlsx, .xls"/>
+                                       <button type="submit" className="btn btn-sm btn-info">Send</button>
+                                   </div>
+                            </form>
+                        </Row>
+                    </Spinner>
+                    <Spinner loading={this.state.enableBusyFeedback}>
+                         <Row>
+                           <div className={'addPaddingTop alert alert-danger ' +(this.state.errorResults ? 'show' : 'hidden')} role="alert">
+                               An error occurred, please try again later. If this issue persists, please contact the system administrator. {this.state.errorMessage}
+                           </div>
+                         </Row>
+                         <Row>
+                           <div className={'addPaddingTop alert alert-success ' +(this.state.showResults ? 'show' : 'hidden')} role="alert">
+                               The updates were made successfully.
+                           </div>
+                         </Row>
+                    </Spinner>
+                </Grid>
+          </div>
+      </div>
+    );
+  }
+ }
+export default Modifications;
diff --git a/src/app/modifications/ModificationsActions.js b/src/app/modifications/ModificationsActions.js
new file mode 100644
index 0000000..e5faa35
--- /dev/null
+++ b/src/app/modifications/ModificationsActions.js
@@ -0,0 +1,20 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
diff --git a/src/app/modifications/ModificationsConstants.js b/src/app/modifications/ModificationsConstants.js
new file mode 100644
index 0000000..e5faa35
--- /dev/null
+++ b/src/app/modifications/ModificationsConstants.js
@@ -0,0 +1,20 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
diff --git a/src/app/modifications/ModificationsReducer.js b/src/app/modifications/ModificationsReducer.js
new file mode 100644
index 0000000..4060806
--- /dev/null
+++ b/src/app/modifications/ModificationsReducer.js
@@ -0,0 +1,19 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
diff --git a/src/app/module/index.js b/src/app/module/index.js
new file mode 100644
index 0000000..6e82e14
--- /dev/null
+++ b/src/app/module/index.js
@@ -0,0 +1,50 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+// Import section (used as anchor to add extension imports)
+import Browse from '../browse/Browse.jsx';
+import SpecializedSearch from '../specializedSearch/SpecializedSearch.jsx';
+import Modifications from '../modifications/Modifications.jsx';
+import Model from '../model/modelSearch/Model.jsx';
+import ModelGallery from '../model/modelSearch/components/ModelGallery.jsx';
+import ModelReducer from '../model/modelSearch/ModelReducer.js';
+import History from '../model/history/History.jsx';
+import HistoryGallery from '../model/history/components/HistoryGallery.jsx';
+import HistoryQuery from '../model/history/HistoryQuery.jsx';
+import CustomQuery from '../customQuery/CustomQuery.jsx';
+import CustomDsl from '../byoq/CustomDsl.jsx';
+import CustomDslBuilder from '../byoq/CustomDslBuilder.jsx';
+
+let components = {};
+// Components section (used as an anchor to add extension components)
+components['ModelGallery'] = ModelGallery;
+components['HistoryGallery'] = HistoryGallery;
+components['HistoryQuery'] = HistoryQuery;
+components['Model'] = Model;
+components['ModelReducer'] = ModelReducer;
+components['History'] = History;
+components['CustomDsl'] = CustomDsl;
+components['CustomDslBuilder'] = CustomDslBuilder;
+components['Browse'] = Browse;
+components['SpecializedSearch'] = SpecializedSearch;
+components['Modifications'] = Modifications;
+components['CustomQuery'] = CustomQuery;
+
+export default components;
diff --git a/src/app/networking/NetworkConstants.js b/src/app/networking/NetworkConstants.js
index 1bc5eb0..8f0de17 100644
--- a/src/app/networking/NetworkConstants.js
+++ b/src/app/networking/NetworkConstants.js
@@ -31,4 +31,11 @@ export const NO_RESULTS_FOUND = 'No Results Found';
 const BACKEND_IP_ADDRESS = document.location.hostname;
 const BACKEND_PORT_NUMBER = window.location.port;
 const PROTOCOL = window.location.protocol;
-export const BASE_URL = PROTOCOL + '//' + BACKEND_IP_ADDRESS + ':' + BACKEND_PORT_NUMBER;
+var base = '';
+var url = window.location.href;
+if(url.includes('ecompc_')){
+  base = PROTOCOL + '//' + BACKEND_IP_ADDRESS + '/' + url.split('/')[3];
+}else{
+  base = PROTOCOL + '//' + BACKEND_IP_ADDRESS + ':' + BACKEND_PORT_NUMBER;
+}
+export const BASE_URL = base;
diff --git a/src/app/personlaization/PersonalizationActions.js b/src/app/personlaization/PersonalizationActions.js
index bdf54ca..affaac8 100644
--- a/src/app/personlaization/PersonalizationActions.js
+++ b/src/app/personlaization/PersonalizationActions.js
@@ -1,78 +1,80 @@
-/*

- * ============LICENSE_START=======================================================

- * org.onap.aai

- * ================================================================================

- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.

- * Copyright © 2017-2018 Amdocs

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *       http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-import {

-    GET

-  } from 'app/networking/NetworkConstants.js';

-import networkCall from 'app/networking/NetworkCalls.js';

-import {

-  GET_PERSONALIZED_VALUES_URL, 

-  PERSONALIZATION_FAILED_MESSAGE,

-  personalizationActionTypes

-} from 'app/personlaization/PersonalizationConstans.js';

-import {

-  getSetGlobalMessageEvent

-} from 'app/globalInlineMessageBar/GlobalInlineMessageBarActions.js';

-

-import {  

-  STATUS_CODE_5XX_SERVER_ERROR,

-  MESSAGE_LEVEL_WARNING

-} from 'utils/GlobalConstants.js';

-

-

-function createPersonalizedValuesEvent(payload) {

-

-  let event = {

-    type: personalizationActionTypes.PERSONALIZATION_PAYLOAD_FOUND,

-    data: payload

-  };

-  return event;

-}

-

-function fetchPersonalizedValues(fetchRequestCallback) {

-  return dispatch => {

-    return fetchRequestCallback().then(

-      (response) => {

-        if (response.status >= STATUS_CODE_5XX_SERVER_ERROR) {

-          dispatch(getSetGlobalMessageEvent(PERSONALIZATION_FAILED_MESSAGE , MESSAGE_LEVEL_WARNING));

-        } else {

-          // assume 200 status

-          return response.json();

-        }

-      }

-    ).then(

-      (results)=> {

-        dispatch(createPersonalizedValuesEvent(results));

-      }

-    ).catch(

-      () => {

-        dispatch(getSetGlobalMessageEvent(PERSONALIZATION_FAILED_MESSAGE , MESSAGE_LEVEL_WARNING));

-      }

-    );

-  };

-}

-

-export function getPersonalizationDetails(){

-  let personalizationFetchRequest =

-    () => networkCall.getRequest(GET_PERSONALIZED_VALUES_URL, GET);

-    

-  return dispatch => dispatch(fetchPersonalizedValues(personalizationFetchRequest));

-}

+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Amdocs
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import {
+    GET
+  } from 'app/networking/NetworkConstants.js';
+import networkCall from 'app/networking/NetworkCalls.js';
+import {
+  GET_PERSONALIZED_VALUES_URL, 
+  PERSONALIZATION_FAILED_MESSAGE,
+  personalizationActionTypes
+} from 'app/personlaization/PersonalizationConstans.js';
+import {
+  getSetGlobalMessageEvent
+} from 'app/globalInlineMessageBar/GlobalInlineMessageBarActions.js';
+
+import {  
+  STATUS_CODE_5XX_SERVER_ERROR,
+  MESSAGE_LEVEL_WARNING
+} from 'utils/GlobalConstants.js';
+
+
+function createPersonalizedValuesEvent(payload) {
+
+  let event = {
+    type: personalizationActionTypes.PERSONALIZATION_PAYLOAD_FOUND,
+    data: payload
+  };
+  return event;
+}
+
+function fetchPersonalizedValues(fetchRequestCallback) {
+  return dispatch => {
+    return fetchRequestCallback().then(
+      (response) => {
+        if (response.status >= STATUS_CODE_5XX_SERVER_ERROR) {
+          dispatch(getSetGlobalMessageEvent(PERSONALIZATION_FAILED_MESSAGE , MESSAGE_LEVEL_WARNING));
+        } else {
+          // assume 200 status
+          //for localonly do not commit
+          //dispatch(createPersonalizedValuesEvent(response));
+          return response.json();
+        }
+      }
+    ).then(
+      (results)=> {
+        dispatch(createPersonalizedValuesEvent(results));
+      }
+    ).catch(
+      () => {
+        dispatch(getSetGlobalMessageEvent(PERSONALIZATION_FAILED_MESSAGE , MESSAGE_LEVEL_WARNING));
+      }
+    );
+  };
+}
+
+export function getPersonalizationDetails(){
+  let personalizationFetchRequest =
+    () => networkCall.getRequest(GET_PERSONALIZED_VALUES_URL, GET);
+    
+  return dispatch => dispatch(fetchPersonalizedValues(personalizationFetchRequest));
+}
diff --git a/src/app/personlaization/PersonalizationConstans.js b/src/app/personlaization/PersonalizationConstans.js
index bbe0174..755c244 100644
--- a/src/app/personlaization/PersonalizationConstans.js
+++ b/src/app/personlaization/PersonalizationConstans.js
@@ -1,30 +1,31 @@
-/*

- * ============LICENSE_START=======================================================

- * org.onap.aai

- * ================================================================================

- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.

- * Copyright © 2017-2018 Amdocs

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *       http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-import keyMirror from 'utils/KeyMirror.js';

-import {BASE_URL} from 'app/networking/NetworkConstants.js';

-

-export const personalizationActionTypes = keyMirror({

-  PERSONALIZATION_PAYLOAD_FOUND: null

-});

-

-export const GET_PERSONALIZED_VALUES_URL = BASE_URL + '/rest/getPersonalizedValues';

-export const PERSONALIZATION_FAILED_MESSAGE = 'Failed to fetch personalization values';

+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Amdocs
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import keyMirror from 'utils/KeyMirror.js';
+import {BASE_URL} from 'app/networking/NetworkConstants.js';
+
+export const personalizationActionTypes = keyMirror({
+  PERSONALIZATION_PAYLOAD_FOUND: null
+});
+
+export const GET_PERSONALIZED_VALUES_URL = BASE_URL + '/rest/getPersonalizedValues';
+export const PERSONALIZATION_FAILED_MESSAGE = 'Failed to fetch personalization values';
+//export const GET_PERSONALIZED_VALUES_URL ='https://localhost:8000/rest/getPersonalizedValues';
diff --git a/src/app/specializedSearch/SpecializedSearch.jsx b/src/app/specializedSearch/SpecializedSearch.jsx
new file mode 100644
index 0000000..91a45be
--- /dev/null
+++ b/src/app/specializedSearch/SpecializedSearch.jsx
@@ -0,0 +1,266 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, {Component} from 'react';
+import Filter from 'generic-components/filter/Filter.jsx';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+import Col from 'react-bootstrap/lib/Col';
+import Row from 'react-bootstrap/lib/Row';
+import Grid from 'react-bootstrap/lib/Grid';
+import Panel from 'react-bootstrap/lib/Panel';
+import BootstrapSwitchButton from 'bootstrap-switch-button-react';
+
+let INVLIST = GlobalExtConstants.INVLIST;
+let OXM = GlobalExtConstants.OXM;
+
+let invList = null;
+let APERTURE_SERVICE = JSON.parse(sessionStorage.getItem(GlobalExtConstants.ENVIRONMENT + 'APERTURE_SERVICE'));
+
+class SpecializedSearch extends Component {
+
+  state = {
+    data: [],
+    filterList: [],
+    filterSelected: '',
+    filterDisplay: 'Select Filter',
+    filterTypeDisplay: 'Filter Type',
+    errorMsg: '',
+    showFilter:false,
+    filterMessage:[],
+    filterValue:'',
+    filterSelectedList:[],
+    isRunEnable:true,
+    enableRealTime: JSON.parse(sessionStorage.getItem(GlobalExtConstants.ENVIRONMENT + 'ENABLE_ANALYSIS'))
+  };
+
+  constructor(){
+    super();
+    APERTURE_SERVICE=JSON.parse(sessionStorage.getItem(GlobalExtConstants.ENVIRONMENT + 'APERTURE_SERVICE'));
+  }
+  componentDidMount(){
+
+    if(this.state.filterSelected === ''){
+      const invKeys = Object.keys(INVLIST.INVENTORYLIST);
+      invKeys.sort().map((item,i) => {
+        if(i === 0 && this.state.filterSelected === ''){
+          this.setState(
+            { filterSelected: INVLIST.INVENTORYLIST[item].modelPath,filterDisplay:'Select Filter',filterTypeDisplay:'Filter Type'},
+            function(){this.populateFilteringOptions();}.bind(this));        
+        }
+      });
+    }
+  };
+  isContaining(nameKey, listArray){
+    var found = false;    
+    listArray.map((lists) => {      
+      if(lists.id === nameKey){
+        console.log('foundName key in list',lists.id);      
+        found = true;
+      }
+    });    
+    return found;
+  };
+  radioButtonSelectedHandler(event) {
+    console.log('radio button clicked');
+    this.setState(
+      { filterSelected: event.target.value,filterList:[],filterSelectedList:[],filterDisplay:'Select Filter',filterTypeDisplay:'Filter Type',filterMessage:[]},
+      function(){this.populateFilteringOptions();}.bind(this)
+    );
+  };
+  camelToDash = (str) => {
+    return (str.replace(/\W+/g, '-')
+        .replace(/([a-z\d])([A-Z])/g, '$1-$2')).toLowerCase();
+  }
+  populateFilteringOptions = () => {
+
+    let result = JSON.parse(OXM);
+    let arrayOfTypes = result['xml-bindings']['java-types'][0]['java-type'];
+    console.log('arrayOfTypes ', arrayOfTypes);
+    let foundIndex = -1;    
+    let searchParam = this.state.filterSelected;
+    if(['PSERVER', 'COMPLEX', 'CLOUDREGION', 'NETWORKPROFILE', 'VIRTUALDATACENTER'].indexOf(this.state.filterSelected.toUpperCase()) === -1){
+      searchParam = this.state.filterSelected.substring(0, this.state.filterSelected.length - 1);
+    }
+    if('CHASSIES'.indexOf(this.state.filterSelected.toUpperCase()) !== -1){
+      searchParam = this.state.filterSelected.substring(0, this.state.filterSelected.length - 2) + 's';
+    }else if(this.state.filterSelected.substr(this.state.filterSelected.length - 3) === 'ies'){
+      searchParam = this.state.filterSelected.substring(0, this.state.filterSelected.length - 3) + 'y';
+    }else if('COMPLEXES'.indexOf(this.state.filterSelected.toUpperCase()) !== -1){
+      searchParam = this.state.filterSelected.substring(0, this.state.filterSelected.length - 2);
+    }
+    if(searchParam === 'PINTERFACE'){
+      searchParam = 'pInterface';
+    }
+    if(this.state.filterSelected.toUpperCase() === 'LINESOFBUSINESS'){
+      searchParam = 'lineOfBusiness';
+    }
+    console.log('searchParam Node type',searchParam);
+    for (var i = 0; i < arrayOfTypes.length && foundIndex === -1; i++) {
+      if (arrayOfTypes[i]['xml-root-element'][0]['$']['name'] === this.camelToDash(searchParam)) {
+        console.log(arrayOfTypes[i]);
+        foundIndex = i;
+      }
+    }
+    var tempState = this.state;
+    tempState.filterList = [];
+    if(foundIndex !== -1){
+      tempState.errorMsg = '';    
+      //build the filter list
+      if (arrayOfTypes[foundIndex]['java-attributes']) {
+        let elementLength = 0;
+        if (arrayOfTypes[foundIndex]['java-attributes'][0]['xml-element']) {
+          elementLength = arrayOfTypes[foundIndex]['java-attributes'][0]['xml-element'].length;
+        }
+        for (var j = 0; j < elementLength; j++) {
+          let isPrimitive = JSON.stringify(arrayOfTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['$']['type']).indexOf('java.lang') > -1;
+          if(isPrimitive) { //add to the list
+            let node = {value: arrayOfTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['$']['name']};
+            tempState.filterList.push(node);
+          }
+        }
+      }
+
+      //sort the filter list
+      tempState.filterList = tempState.filterList.sort(function(filter1, filter2) {
+        if ( filter1.value < filter2.value ){
+          return -1;
+        }else if( filter1.value > filter2.value ){
+          return 1;
+        }else{
+          return 0;
+        }
+      });
+    }
+    this.setState(tempState);
+    console.log('tempState.filterList ' + JSON.stringify(tempState.filterList));
+  };
+  initialUpdateOfFilter = (filter) => {
+    this.setState(
+      { filterSelected: filter,filterDisplay:'Select Filter',filterTypeDisplay:'Filter Type'},
+      function(){this.populateFilteringOptions();}.bind(this)
+    );
+  };
+  toggleRealTimeAnalysisCallback=(checked)=>{
+    console.log('toggleRealTimeAnalysisCallback>>>>',checked);
+    sessionStorage.setItem(GlobalExtConstants.ENVIRONMENT + 'ENABLE_ANALYSIS', !checked);
+    
+    this.setState({ enableRealTime: !checked, 
+                    filterList:[], 
+                    filterSelectedList:[], 
+                    filterDisplay:'Select Filter', 
+                    filterTypeDisplay:'Filter Type', 
+                    filterMessage:[],
+                    errorMsg: "",                    
+                    filterMessage: [],
+                    filterValue: "",
+                    isRunEnable: true,
+                    showFilter: false},function(){this.populateFilteringOptions();}.bind(this));
+  }
+  render(){
+    var toggelRealtimeAnalysis = '';
+	  if(APERTURE_SERVICE){		
+		  toggelRealtimeAnalysis = <div className='toggleSwitch'><BootstrapSwitchButton
+									checked={!this.state.enableRealTime}
+									onlabel='Real Time'
+									onstyle='danger'
+									offlabel='Analysis'
+									offstyle='success'
+									style='w-100 mx-3'
+									onChange={(checked) => {
+										this.toggleRealTimeAnalysisCallback(checked);
+									}}
+								/></div>             
+	 }
+    let pagetitle = '';
+    if(this.state.filterSelected !== ''){
+      pagetitle = INVLIST.INVENTORYLIST[this.state.filterSelected.replace(/\s/g,'').toUpperCase()].display;
+    }
+    const invKeys = Object.keys(INVLIST.INVENTORYLIST);
+    invList = invKeys.sort().map((item,i) => {
+      let checkedStatus = INVLIST.INVENTORYLIST[item].modelPath === this.state.filterSelected;
+      if(i === 0 && this.state.filterSelected === ''){
+        checkedStatus = true;        
+      }
+      let selectedClass = 'leftNavSelection';
+      if(checkedStatus){
+        selectedClass = 'leftNavSelected ';
+      }
+      return (
+        <div key={INVLIST.INVENTORYLIST[item].display} className={'form-row ' + selectedClass}>
+        <label role='radio' className='radio'>
+              <input type='radio' name='optionsRadios' className='optionsRadios'
+                value={INVLIST.INVENTORYLIST[item].modelPath} 
+                checked={checkedStatus} 
+                onChange={(event)=> this.radioButtonSelectedHandler(event)}/>
+            <i className='skin'></i>
+            <span>{INVLIST.INVENTORYLIST[item].display}</span>
+        </label>
+        </div>
+      );
+    });
+
+    return(
+      <div>
+          {toggelRealtimeAnalysis}
+          <div id='specialSearch'>
+                <header className='addPadding jumbotron my-4'>
+                    <h1 className='display-2'>Network Element Specialized Search</h1>
+                    <p className='lead'>
+                      On this page you have the ability to build a set of query criteria per network element type and run a query. Simply choose the network element type from the radio buttons, build your filters, and run.
+                    </p>
+                </header>
+          </div>
+            <div className='addPadding'>
+                <Row className='show-grid' style={{margin: '0px'}}>
+                  <Col md={3} className='leftNavSelection'>
+                    <header>List of Network Element Types</header>
+                    <form id='filters'  name='myForm'>
+                      <fieldset role='radiogroup' aria-labelledby='radiolabel1' className='leftNavSelection'>
+                        {invList}
+                      </fieldset>
+                    </form>
+                  </Col>
+                  <Col md={9} className='mainSectionSelection'>
+                    <Panel bsStyle='primary'>
+                      <Panel.Heading>
+                        <Panel.Title componentClass='h3'>Filter Section : {pagetitle} </Panel.Title>
+                      </Panel.Heading>
+                      <Panel.Body>
+                        <Filter key='specializedSearch'
+                          nodeType={this.state.filterSelected}
+                          filterList={this.state.filterList}
+                          filterDisplay={this.state.filterDisplay}
+                          filterTypeDisplay={this.state.filterTypeDisplay}
+                          isRunEnable={this.state.isRunEnable}
+                          filterMessage={this.state.filterMessage}
+                          filterSelectedList={this.state.filterSelectedList}
+                          isFilterEnable={true} 
+                          errorMsg={this.state.errorMsg}
+                          enableRealTime={this.state.enableRealTime}/>     
+                      </Panel.Body>
+                    </Panel>                    
+                  </Col>
+                </Row>
+              </div>
+          </div>
+    );
+  }
+}
+export default SpecializedSearch;
diff --git a/src/app/specializedSearch/SpecializedSearchActions.js b/src/app/specializedSearch/SpecializedSearchActions.js
new file mode 100644
index 0000000..e5faa35
--- /dev/null
+++ b/src/app/specializedSearch/SpecializedSearchActions.js
@@ -0,0 +1,20 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
diff --git a/src/app/specializedSearch/SpecializedSearchConstants.js b/src/app/specializedSearch/SpecializedSearchConstants.js
new file mode 100644
index 0000000..ad4d715
--- /dev/null
+++ b/src/app/specializedSearch/SpecializedSearchConstants.js
@@ -0,0 +1,22 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+ export const ATT_URI = 'localhost:8887';
+ 
diff --git a/src/app/specializedSearch/SpecializedSearchReducer.js b/src/app/specializedSearch/SpecializedSearchReducer.js
new file mode 100644
index 0000000..e5faa35
--- /dev/null
+++ b/src/app/specializedSearch/SpecializedSearchReducer.js
@@ -0,0 +1,20 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
diff --git a/src/generic-components/DownloadRangeModel.jsx b/src/generic-components/DownloadRangeModel.jsx
new file mode 100644
index 0000000..239ba64
--- /dev/null
+++ b/src/generic-components/DownloadRangeModel.jsx
@@ -0,0 +1,236 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, {Component} from 'react';
+import Modal from 'react-bootstrap/lib/Modal';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+import Row from 'react-bootstrap/lib/Row';
+import Button from 'react-bootstrap/lib/Button';
+import Spinner from 'utils/SpinnerContainer.jsx';
+
+let PAGINATION_CONSTANT = GlobalExtConstants.PAGINATION_CONSTANT;
+let PAGINATION_RESULTS = PAGINATION_CONSTANT.RESULTS_PER_PAGE;
+
+class DownloadRangeModel extends Component {
+  constructor(props){
+    super(props); 
+    let totalPages = Math.ceil(this.props.totalResults/PAGINATION_RESULTS);
+    let defaultCount = (totalPages < 10)? totalPages : 10;
+    let defaultPageRange = defaultCount*PAGINATION_RESULTS;
+    this.state = {
+      defaultPageCount : defaultCount,
+      downloadType: 'defaultPage',
+      totalPages:totalPages,
+      limitTotalPages:defaultCount,
+      startPageCount:'',
+      endPageCount:'',
+      defaultPageError:false,
+      downloadPageRangeError:false,
+      defaultPageErrorMsg:'',
+      downloadPageRangeErrorMsg:'',
+      showDownloadResultsModal:this.props.showDownloadResultsModal, 
+      triggerDownload:this.props.triggerDownload,
+      triggerClose:this.props.triggerClose,
+      totalResults: this.props.totalResults,
+      errorDownloadResults:this.props.errorDownloadResults,
+      downloadErrorMsg:this.props.downloadErrorMsg,
+      pageRange:defaultPageRange,
+      enableBusyFeedback: this.props.enableModelBusyFeedback
+    }; 
+  };   
+  componentDidMount(){
+    console.log('DownloadRange component  mount');    
+  };
+  componentWillReceiveProps(nextProps){
+    console.log('DownloadRange component  componentWillReceiveProps',nextProps);
+    let totalPages = Math.ceil(nextProps.totalResults/PAGINATION_RESULTS);
+    let defaultCount = (totalPages < 10)? totalPages : 10;
+    let defaultPageRange = defaultCount*PAGINATION_RESULTS;
+    this.setState({
+      showDownloadResultsModal:nextProps.showDownloadResultsModal, 
+      errorDownloadResults:nextProps.errorDownloadResults,
+      downloadErrorMsg:nextProps.downloadErrorMsg,
+      enableBusyFeedback: nextProps.enableModelBusyFeedback,
+      totalPages:totalPages,
+      limitTotalPages:defaultCount,
+      defaultPageCount: defaultCount
+    });
+  }    
+  renderError = (errorMsg) => {    
+    return(
+        <Row className='show-grid topBottomMargin'>
+          <span className='label badge-pill label-danger topBottomMargin pre-wrap-text'><strong>Error</strong>: {errorMsg}</span>
+        </Row>
+      );
+  };
+  onInputDataChange = (event) =>{
+    let name=event.target.name;
+    let value= (event.target.value !== '')? parseInt(event.target.value): '';
+    this.onDataValidate(name,value);
+  }
+  onDataValidate =(name,value) =>{
+    console.log('DownloadRangeModel onDataValidate>>>>>>',this.state);
+    let pageCount=1;
+    let msg='';
+    let totalCount = 0;
+    let totalResultsCount=0;
+    if(name === 'defaultPageCount'){
+      if(isNaN(value)){
+        msg = 'Please enter valid input as Number';
+      }else if(value <= 0){        
+        msg = 'Please enter valid page count From 1 to ' + this.state.limitTotalPages;
+      }else if(value > this.state.limitTotalPages ){
+        msg = 'Please enter valid page count From 1 to ' + this.state.limitTotalPages+'.The maximum download is limited to '+this.state.limitTotalPages +' pages at a time';
+      }
+      if(msg === ''){
+          pageCount=value*PAGINATION_RESULTS;
+          console.log('Before setting state defaultPageCount>>>>>',value);
+          this.setState({defaultPageCount:value,pageRange:pageCount,defaultPageError:false,defaultPageErrorMsg:'',disableDownloadBtn:false});
+      }else if(msg !== ''){
+        this.setState({defaultPageCount:event.target.value,defaultPageError:true,defaultPageErrorMsg:msg,disableDownloadBtn:true});
+      }
+    }else if(name === 'startPageCount'){      
+      if(isNaN(value)){
+        msg = 'Please enter valid input as Number';
+      }   
+      if(msg === ''){
+        console.log('Before setting state startPageCount>>>>>',value);        
+        this.setState({startPageCount:value,downloadPageRangeError:false,downloadPageRangeErrorMsg:'',disableDownloadBtn:false},function(){this.onDataValidate('rangeValidation')}.bind(this));
+      }else{
+        this.setState({downloadPageRangeError:true,downloadPageRangeErrorMsg:msg,disableDownloadBtn:true});
+      }     
+    }else if(name === 'endPageCount'){
+      if(isNaN(value)){
+        msg = 'Please enter valid input as Number';
+      }
+      if(msg === ''){
+        console.log('Before setting state endPageCount>>>>>',value);
+        this.setState({endPageCount: value,downloadPageRangeError: false, downloadPageRangeErrorMsg: '',disableDownloadBtn:false},function(){this.onDataValidate('rangeValidation')}.bind(this));        
+      }else{
+        this.setState({downloadPageRangeError:true,downloadPageRangeErrorMsg:msg,disableDownloadBtn:true});
+      }
+    }
+    if(name === 'rangeValidation'){
+      let startCount = this.state.startPageCount;
+      startCount=(startCount === '')? 0:parseInt(startCount);
+      let endCount = this.state.endPageCount;
+      endCount=(endCount === '')? 0:parseInt(endCount);
+      if(startCount <= 0 || endCount <= 0 || startCount > this.state.totalPages || endCount > this.state.totalPages || startCount > endCount || endCount < startCount){
+        msg = 'Please enter a valid page range from 1 to '+ this.state.totalPages +'.The maximum download is limited to '+ this.state.limitTotalPages +' pages at a time';
+      }else{
+        totalCount = this.state.endPageCount - this.state.startPageCount + 1;
+        totalResultsCount=totalCount*PAGINATION_RESULTS;
+        if(totalCount > 10){
+          msg = 'The maximum download is limited to '+ this.state.limitTotalPages +' pages at a time. Please adjust your input to continue';
+        }
+      }   
+      if(msg !== ''){
+        this.setState({downloadPageRangeError:true,downloadPageRangeErrorMsg:msg,disableDownloadBtn:true});
+      }else{       
+        pageCount=this.state.startPageCount + '-' + this.state.endPageCount;
+        this.setState({disableDownloadBtn: false, pageRange: pageCount});
+      }
+    } 
+  };
+  setSelectTypeOfDownload = (event) =>{
+    console.log('DownloadRange:setSelectTypeOfDownload',event.target.value);
+    let totalPages=parseInt(this.state.totalPages); 
+    let pageCount=0;   
+    if (event.target.value === 'downloadPageRange'){
+      this.setState(
+        {defaultPageCount : (totalPages < 10)? totalPages : 10,startPageCount:'',endPageCount:'',downloadType:event.target.value,downloadPageRangeError:false,defaultPageError:false,disableDownloadBtn:true, downloadErrorMsg:'', errorDownloadResults:false}
+       );
+    }else{
+      pageCount= (totalPages < 10)? totalPages*PAGINATION_RESULTS : 10*PAGINATION_RESULTS;
+      this.setState({defaultPageCount : (totalPages < 10)? totalPages : 10, startPageCount:'',endPageCount:'',pageRange:pageCount,downloadType:event.target.value,downloadPageRangeError:false,defaultPageError:false,disableDownloadBtn:false, downloadErrorMsg:'',errorDownloadResults:false});
+    } 
+  }
+  submitDownloadResults = () =>{
+    console.log('DownloadRange:submitDonwloadResults',this.state);    
+    this.props.triggerDownload(this.state.pageRange,true);    
+  }
+  closeDownloadResults = () =>{
+    console.log('DownloadRange:closeDownloadReults');
+    this.props.triggerClose(); 
+  }
+  render(){ 
+    console.log('downloadRange:this.state>>>>>>>>>>>*',this.state); 
+    return(
+        <div id='downloadPagePane' className='addPadding customDsl'>
+          <div className='static-modal'>
+            <Modal show={this.state.showDownloadResultsModal} onHide={this.closeDownloadResults}>
+              <Modal.Header>
+                <Modal.Title>Download Results</Modal.Title>
+              </Modal.Header>
+              <Modal.Body>
+                <h4>Your result set has <strong>{this.state.totalPages}</strong> pages</h4>
+                {this.state.errorDownloadResults && (<div>{this.renderError(this.state.downloadErrorMsg)}</div>)}
+                <form id='downloadRangeForm' name='downloadRangeForm'>
+                  <div className="radio">
+                    <label>
+                      <input type="radio" value="defaultPage"
+                              checked={this.state.downloadType === 'defaultPage'}
+                              onChange={(e) => this.setSelectTypeOfDownload(e)} />                     
+                      <input type='number' size='8' name='defaultPageCount'
+                              onBlur={(event) => this.onInputDataChange(event)} 
+                              placeholder='Default Page Count' 
+                              value={this.state.defaultPageCount}
+                              disabled={!(this.state.downloadType === 'defaultPage')}
+                              onChange={(event) => this.onInputDataChange(event)} />
+                      <span>pages</span>
+                    </label>
+                    {this.state.defaultPageError && (<div>{this.renderError(this.state.defaultPageErrorMsg)}</div>)}
+                  </div>
+                  <div className="radio">
+                    <label>
+                      <input type="radio"  value="downloadPageRange"
+                              checked={this.state.downloadType === 'downloadPageRange'}
+                              onChange={(e) => this.setSelectTypeOfDownload(e)} />
+                      From 
+                      <span><input type='number' size='8' name='startPageCount'
+                              onBlur={(event) => this.onInputDataChange(event)} 
+                              placeholder='Start Page'
+                              disabled={!(this.state.downloadType === 'downloadPageRange')}
+                              value={this.state.startPageCount}                             
+                              onChange={(event) => this.onInputDataChange(event)} /></span>
+                      <span>To</span>
+                      <span><input type='number' size='8' name='endPageCount'
+                              onBlur={(event) => this.onInputDataChange(event)} 
+                              placeholder='End Page' 
+                              value={this.state.endPageCount}
+                              disabled={!(this.state.downloadType === 'downloadPageRange')}                              
+                              onChange={(event) => this.onInputDataChange(event)} /></span>
+                      <span>pages</span>
+                    </label>
+                    {this.state.downloadPageRangeError && (<div>{this.renderError(this.state.downloadPageRangeErrorMsg)}</div>)}
+                  </div>
+                </form>
+              </Modal.Body>
+              <Modal.Footer>
+                <Button onClick={this.closeDownloadResults}>Close</Button>
+                <Button onClick={this.submitDownloadResults} disabled={this.state.disableDownloadBtn}>Download</Button>
+              </Modal.Footer>
+            </Modal>
+          </div>
+        </div>
+    );
+  }
+}
+export default DownloadRangeModel;
diff --git a/src/generic-components/InfoToggle.jsx b/src/generic-components/InfoToggle.jsx
new file mode 100644
index 0000000..928eea7
--- /dev/null
+++ b/src/generic-components/InfoToggle.jsx
@@ -0,0 +1,106 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, { Component } from 'react';
+import Modal from 'react-bootstrap/lib/Modal';
+import Col from 'react-bootstrap/lib/Col';
+import Row from 'react-bootstrap/lib/Row';
+import Tabs from 'react-bootstrap/lib/Tabs';
+import Button from 'react-bootstrap/lib/Button';
+import Tab from 'react-bootstrap/lib/Tab';
+import BootstrapTable from 'react-bootstrap-table-next';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+
+
+class InfoToggle extends Component {
+  constructor(props){
+      console.log(props);
+      super(props);
+      this.props = props;
+      this.state = {
+                     showInfoModal: false
+                   };
+  }
+  openInfoModal = () =>{
+        this.setState({showInfoModal:true});
+  }
+  closeInfoModal = () =>{
+        this.setState({showInfoModal:false});
+  }
+  getReferenceJson = (reference) =>{
+    return require('app/assets/configuration/' + GlobalExtConstants.PATHNAME + '/reference/' + reference + '.json');
+  }
+  render(){
+    let tableColumnsList = [];
+    let tableDataList = [];
+    let types = this.getReferenceJson('types');
+    types.map(type => {
+         tableColumnsList[type] = [];
+         tableDataList[type] = this.getReferenceJson(type);
+         for(var key in tableDataList[type][0]){
+            var isHidden = key === 'id';
+            tableColumnsList[type].push({dataField: key, text: key, hidden: isHidden });
+         }
+    });
+    let tabs=types.map((nodeType,index) => {
+      return(
+        <Tab eventKey={nodeType} title={nodeType}>
+          <BootstrapTable
+              id={nodeType}
+              keyField='id'
+              data={tableDataList[nodeType]}
+              columns={tableColumnsList[nodeType]}
+              bordered={ true }
+              headerClasses='table-header-view'
+              bootstrap4 striped hover condensed
+          />
+        </Tab>
+      )
+    });
+      if (!GlobalExtConstants.INVLIST.IS_ONAP){
+            return (
+            <div>
+              <div className='static-modal'>
+                               		<Modal show={this.state.showInfoModal} onHide={this.closeInfoModal}>
+                               			<Modal.Header>
+                               				<Modal.Title>Information</Modal.Title>
+                               			</Modal.Header>
+                               			<Modal.Body>
+                                            <Tabs defaultActiveKey={types[0]} id="multipleTabularView">
+                                              {tabs}
+                                            </Tabs>
+                               			</Modal.Body>
+                               			<Modal.Footer>
+                               				<Button onClick={this.closeInfoModal}>Close</Button>
+                               			</Modal.Footer>
+                               		</Modal>
+              </div>
+              <div className='col-xs-1'>
+                  <i className='dsl-hint icon-documents-manual' onClick={this.openInfoModal} ></i>
+                  <pre>Info</pre>
+              </div>
+            </div>);
+      }else{
+            return (<span></span>);
+      }
+  }
+};
+
+export default InfoToggle;
diff --git a/src/generic-components/MultiSelectDropDown.jsx b/src/generic-components/MultiSelectDropDown.jsx
new file mode 100644
index 0000000..e9124a5
--- /dev/null
+++ b/src/generic-components/MultiSelectDropDown.jsx
@@ -0,0 +1,56 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, {Component} from 'react';
+import Select from 'react-select';
+
+class MultiSelectDropDown extends Component {
+  constructor(props) {
+	super(props); 
+	this.state = {
+		options:[],
+		displayValue:'Category'
+	  };    
+  }
+  componentDidMount(){
+    console.log('MultiSelectDropDown component  mount');    
+  };
+  componentWillReceiveProps(nextProps){
+	console.log('MultiSelectDropDown component  componentWillReceiveProps',nextProps);
+	this.setState({
+		options:nextProps.options,
+		displayValue:nextProps.displayValue,
+		triggerSelect:nextProps.triggerSelect,
+	  });
+  }
+  render() {    
+    return (	
+	 	 		<Select
+					className='dropdown-item basic-multi-select'
+					placeholder={this.state.displayValue}
+					onChange={this.state.triggerSelect}
+					options={this.state.options} 
+					isMulti
+    			classNamePrefix="select"
+				/>
+    );
+  }
+}
+export default MultiSelectDropDown;
diff --git a/src/generic-components/OutputToggle.jsx b/src/generic-components/OutputToggle.jsx
new file mode 100644
index 0000000..9d82260
--- /dev/null
+++ b/src/generic-components/OutputToggle.jsx
@@ -0,0 +1,53 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React from 'react';
+import Col from 'react-bootstrap/lib/Col';
+import Row from 'react-bootstrap/lib/Row';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+
+let PAGINATION_CONSTANT = GlobalExtConstants.PAGINATION_CONSTANT;
+
+const OutputToggle = (props) => {
+
+  return (
+      <div className="addPaddingSide">
+          <Row className='show-grid'>
+             <Col md={8}>
+                <button type='button' className={'btn ' + ((props.scope.state.viewName === "CardLayout") ? 'btn-primary' : 'btn-outline-secondary')} value="CardLayout" onClick={(e) => props.scope.setViewName(e)}><i className={'icon-content-gridL ' + ((props.scope.state.viewName === "CardLayout") ? 'tabIconChosen' : 'tabIconNotChosen')} role="img"></i></button>
+                {!props.cellDisabled && <button type='button' className={'btn ' + ((props.scope.state.viewName === "CellLayout") ? 'btn-primary' : 'btn-outline-secondary')} value="CellLayout" onClick={(e) => props.scope.setViewName(e)}><i className={'icon-content-gridguideL ' + ((props.scope.state.viewName === "CellLayout") ? 'tabIconChosen' : 'tabIconNotChosen')} role="img"></i></button>}
+                {!props.visualDisabled && <button type='button' className={'btn ' + ((props.scope.state.viewName === "VisualLayout") ? 'btn-primary' : 'btn-outline-secondary')} value="VisualLayout" onClick={(e) => props.scope.setViewName(e)}><i className={'icon-datanetwork-globalnetworkL ' + ((props.scope.state.viewName === "VisualLayout") ? 'tabIconChosen' : 'tabIconNotChosen')} role="img"></i></button>}
+             </Col>
+          </Row>
+          <Row className='show-grid'>
+              <Col md={8}>
+                  <div className='checkbox'>
+                            <label>
+                                {props.scope.state.viewName !==  'VisualLayout' && <input type='checkbox' className='radio'  value={props.scope.state.viewName} name='defaultViewName' checked={props.scope.state.viewName === props.scope.state.defaultViewName} onChange={(e) => props.scope.setDefaultViewName(e)} disabled={props.scope.state.viewName === props.scope.state.defaultViewName}/>}
+                                {props.scope.state.viewName !==  'VisualLayout' && (props.scope.state.viewName === props.scope.state.defaultViewName ? 'Default View' : 'Set as Default View')}
+                            </label>
+                  </div>
+              </Col>
+          </Row>
+      </div>
+  );
+};
+
+export default OutputToggle;
diff --git a/src/generic-components/OutputVisualization.jsx b/src/generic-components/OutputVisualization.jsx
new file mode 100644
index 0000000..734887d
--- /dev/null
+++ b/src/generic-components/OutputVisualization.jsx
@@ -0,0 +1,331 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React from 'react';
+import * as d3 from "d3";
+import 'd3-selection-multi';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+
+let INVLIST = GlobalExtConstants.INVLIST;
+let PAGINATION_CONSTANT = GlobalExtConstants.PAGINATION_CONSTANT;
+
+/**
+ * This function will create a visualization from query outputs
+ * @param props
+ * @returns {*}
+ */
+var populateGraphObject = (nodes, links, data) => {
+        for(var i = 0; i < data.results.length; i++){
+                        nodes[data.results[i].url] = data.results[i];
+                        let nodeType = data.results[i]['node-type'];
+                        nodes[data.results[i].url].weight = 1/((((data.results[i].url).split('\/')).length) - 3);
+                        let splitUrl = (data.results[i].url).split(nodeType + '\/');
+                        nodes[data.results[i].url].nodeTypeLabel = nodeType;
+                        nodes[data.results[i].url].nodeKeyLabel  = splitUrl.pop();
+                        let tempIconString = ((splitUrl.pop()).split('\/'));
+                        tempIconString.pop(); //pop last off, not needed
+                        let iconString = tempIconString.pop();
+                        let iconKey = (iconString.replace(/-/g, '')).toUpperCase();
+                        if(INVLIST.INVENTORYLIST[iconKey] && INVLIST.INVENTORYLIST[iconKey].icon){
+                            nodes[data.results[i].url].icon = INVLIST.INVENTORYLIST[iconKey].icon;
+                        }else{
+                            nodes[data.results[i].url].icon = 'icon-datanetwork-serverL';
+                        }
+                        console.log("icon string: " + nodes[data.results[i].url].icon);
+                        nodes[data.results[i].url].id = data.results[i].url;
+                        for(var j = 0; j < data.results[i]['related-to'].length; j++){
+                            let linkKey = data.results[i].url + '|' + data.results[i]['related-to'][j].url;
+                            let inverseLinkKey = data.results[i]['related-to'][j].url + '|' + data.results[i].url;
+                            if(!links[linkKey] && !links[inverseLinkKey]){
+                                links[linkKey] = data.results[i]['related-to'][j];
+                                links[linkKey].source = data.results[i].url;
+                                links[linkKey].target =  data.results[i]['related-to'][j].url;
+                                links[linkKey].weight = 1/((((data.results[i].url).split('\/')).length) - 3);
+                                let subset = (data.results[i]['related-to'][j]['relationship-label']).split(/[\.]+/);
+                                links[linkKey].type = subset[subset.length - 1];
+                            }
+                        }
+                }
+
+                for (var key in links) {
+                    if (links.hasOwnProperty(key)) {
+                        console.log(key + " -> " + links[key]);
+                        if(!nodes[links[key].source] || !nodes[links[key].target]){
+                              delete links[key];
+                        }
+                    }
+                }
+}
+var chart = (chartId, nodesObj, linksObj, rawData, classContext) => {
+             if(rawData.results.length <= PAGINATION_CONSTANT.RESULTS_PER_PAGE){
+                populateGraphObject( nodesObj, linksObj, rawData);
+                let links = Object.values(linksObj).map(d => Object.create(d));
+                let nodes = Object.values(nodesObj).map(d => Object.create(d));
+                let colors = d3.scaleOrdinal(d3.schemeCategory10);
+
+                let svg = d3.select('#'+chartId),
+                    width = +svg.attr("width"),
+                    height = +svg.attr("height"),
+                    node,
+                    link,
+                    edgepaths,
+                    edgelabels;
+
+                svg.html(null);
+                var g = svg.append("g")
+                            .attr("class", "everything");
+                g.append("rect")
+                    .attr("width", "100%")
+                    .attr("height", "100%")
+                    .attr("fill", "white");
+
+                var forceLink = d3
+                    .forceLink().id(function (d) {
+                        return d.id;
+                    })
+                    .distance(function (d) {
+                        return 1000 * d.weight;
+                    })
+                    .strength(1.5);
+
+                var collisionForce = d3.forceCollide(100).strength(1.5).iterations(100);
+
+                var simulation = d3.forceSimulation()
+                    .force("link", forceLink)
+                    .force("charge", d3.forceManyBody().strength(function (d, i) {
+                            var a = i == 0 ? -2000 : -1000;
+                            return a;
+                        }).distanceMin(200).distanceMax(1000))
+                    .force("center", d3.forceCenter(width / 2, height / 2))
+                    .force("collisionForce",collisionForce);
+
+                //Zoom functions
+                function zoom_actions(){
+                    g.attr("transform", d3.event.transform)
+                }
+                //add zoom capabilities
+                var zoom_handler = d3.zoom()
+                    .on("zoom", zoom_actions);
+
+                zoom_handler(svg);
+
+                update(links, nodes);
+
+                function zoomFit() {
+                                 var bounds = g.node().getBBox();
+                                 var parent = g.node().parentElement;
+                                 var fullWidth = parent.clientWidth || parent.parentNode.clientWidth,
+                                     fullHeight = parent.clientHeight || parent.parentNode.clientHeight;
+                                 var width = bounds.width,
+                                     height = bounds.height;
+                                 var midX = bounds.x + width / 2,
+                                     midY = bounds.y + height / 2;
+                                 if (width == 0 || height == 0) return; // nothing to fit
+                                 var scale = 0.95 / Math.max(width / fullWidth, height / fullHeight);
+                                 var translate = [fullWidth / 2 - scale * midX, fullHeight / 2 - scale * midY];
+
+                                 console.trace("zoomFit", translate, scale);
+
+                                 /*zoom_handler.translateTo(g, translate[0], translate[1])
+                                            .scaleTo(g, scale);*/
+                }
+
+                function update(links, nodes) {
+                    link = g.selectAll(".link")
+                        .data(links)
+                        .enter()
+                        .append("line")
+                        .attrs({
+                        'stroke': '#999',
+                        'stroke-opacity': .6,
+                        'stroke-width': '1px',
+                        'id': function (d, i) {return 'line' + chartId + d.id}
+                        });
+
+                    link.append("title")
+                        .text(function (d) {return d.type;});
+
+                    edgepaths = g.selectAll(".edgepath")
+                        .data(links)
+                        .enter()
+                        .append('path')
+                        .attrs({
+                            'class': 'edgepath',
+                            'fill-opacity': 0,
+                            'stroke-opacity': 0,
+                            'id': function (d, i) {return 'edgepath' + chartId + d.id}
+                        })
+                        .style("pointer-events", "none");
+
+                    /*edgelabels = g.selectAll(".edgelabel")
+                        .data(links)
+                        .enter()
+                        .append('text')
+                        .style("pointer-events", "none")
+                        .attrs({
+                            'class': 'edgelabel',
+                            'id': function (d, i) {return 'edgelabel'  + chartId + d.id},
+                            'font-size': 8,
+                            'fill': '#aaa'
+                        });
+
+                    edgelabels.append('textPath')
+                        .attr('xlink:href', function (d, i) {return '#edgepath' + chartId + d.id})
+                        .style("text-anchor", "middle")
+                        .style("pointer-events", "none")
+                        .attr("startOffset", "50%")
+                        .text(function (d) {return d.type});*/
+
+                    node = g.selectAll(".node")
+                        .data(nodes)
+                        .enter()
+                        .append("g")
+                        .attr("class", "node")
+                        .attr("id", function (d) {return "node" + chartId + (((decodeURIComponent(d.url)).replace(new RegExp('\/', 'g'),'-')).replace(new RegExp(':', 'g'),'-')).replace(new RegExp('\\.', 'g'),'-')})
+                        .call(d3.drag()
+                                 .on("start", dragstarted)
+                                 .on("drag", dragged)
+                                 .on("end", dragended)
+                        );
+
+                    node.append("svg:foreignObject")
+                            .attr("width", 70)
+                            .attr("height", 70)
+                            .attr("x", -45)
+                            .attr("dy", function (d) {return -1 * (Math.max((Math.round(d.weight * 250)/10), 2));})
+                        .append("xhtml:span")
+                    	      .attr("class", function (d) {return d.icon;})
+                             .style("padding", "10px")
+                             .style("font-size", function (d) {return Math.max(Math.round(d.weight * 250), 20) + "px";})
+                             .attr("id", function (d) {return "nodeIcon" + chartId + (((decodeURIComponent(d.url)).replace(new RegExp('\/', 'g'),'-')).replace(new RegExp(':', 'g'),'-')).replace(new RegExp('\\.', 'g'),'-')})
+                             .style("color", '#387dff')
+                             .style("display", "block");
+
+
+                    node.append("title")
+                        .text(function (d) {return decodeURIComponent(d.id);});
+
+                    node.append("text")
+                        .attr("dy", 0)
+                        .attr("dx", -10)
+                        .attr('font-size', 10)
+                        .text(function (d) {return d.nodeTypeLabel;})
+                        .style("text-anchor", "middle");
+
+                    node.append("text")
+                        .attr("dy", function (d) {return (Math.max(Math.round(d.weight * 250) + 15, 55));})
+                        .attr("dx", -10)
+                        .attr('font-size', 8)
+                        .text(function (d) {return decodeURIComponent(d.nodeKeyLabel);})
+                        .style("text-anchor", "middle");
+
+                    node.on("dblclick",function(d){ classContext.openNodeModal("test", d.url, d['node-type']) });
+
+                    simulation
+                        .nodes(nodes)
+                        .on("tick", ticked)
+                        .on("end", zoomFit);
+
+                    simulation.force("link")
+                        .links(links);
+
+                    svg.on("dblclick.zoom", null);
+                }
+
+                function ticked() {
+                    link
+                        .attr("x1", function (d) {return d.source.x;})
+                        .attr("y1", function (d) {return d.source.y;})
+                        .attr("x2", function (d) {return d.target.x;})
+                        .attr("y2", function (d) {return d.target.y;});
+
+                    node
+                        .attr("transform", function (d) {return "translate(" + d.x + ", " + d.y + ")";});
+
+                    edgepaths.attr('d', function (d) {
+                        return 'M ' + d.source.x + ' ' + d.source.y + ' L ' + d.target.x + ' ' + d.target.y;
+                    });
+
+                    /*edgelabels.attr('transform', function (d) {
+                        if (d.target.x < d.source.x) {
+                            let bbox = this.getBBox();
+                            let rx = bbox.x + bbox.width / 2;
+                            let ry = bbox.y + bbox.height / 2;
+                            return 'rotate(180 ' + rx + ' ' + ry + ')';
+                        }
+                        else {
+                            return 'rotate(0)';
+                        }
+                    });*/
+                }
+
+                function dragstarted(d) {
+                    simulation.stop();
+                }
+
+                function dragged(d) {
+                    d.fx = d3.event.x;
+                    d.fy = d3.event.y;
+                    d.x =  d3.event.x;
+                    d.y =  d3.event.y;
+                    ticked();
+                }
+
+                function dragended(d) {
+                  d.fixed = true;
+                  ticked();
+                }
+        }else{
+             let svg = d3.select('#'+chartId),
+                                width = +svg.attr("width"),
+                                height = +svg.attr("height"),
+                                node,
+                                link,
+                                edgepaths,
+                                edgelabels;
+             let svgHtml = "<foreignObject x=\"0\" y=\"0\" width=\"100%\" height=\"100%\">" +
+                                "<body xmlns=\"http://www.w3.org/1999/xhtml\">" +
+                                    "<div class=\"svgbody\">" +
+                                        "<h1>Graphical output is limited to " + PAGINATION_CONSTANT.RESULTS_PER_PAGE +
+                                        " nodes. Your query returned " + rawData.results.length +
+                                        " nodes, which the GUI does not support, please limit your query or if this data" +
+                                        " is needed access it through our externally supported APIs." +
+                                        "</h1>" +
+                                     "</div>"+
+                                "</body>"+
+                            "</foreignObject>";
+             svg.html(svgHtml);
+        }
+}
+const OutputVisualization = (props) => {
+    if (props.identifier && props.width && props.height && props.overflow) {
+        return (
+          <svg id={props.identifier} width={props.width} height={props.height} overflow={props.overflow}></svg>
+        );
+
+    }else{
+        return (<p>Graph Configuration Error</p>);
+    }
+};
+
+export default OutputVisualization;
+export const Visualization = {
+    chart: chart
+}
diff --git a/src/generic-components/autoCompleteSearchBar/AutoCompleteSearchBar.jsx b/src/generic-components/autoCompleteSearchBar/AutoCompleteSearchBar.jsx
index 47cdc9a..3bc9508 100644
--- a/src/generic-components/autoCompleteSearchBar/AutoCompleteSearchBar.jsx
+++ b/src/generic-components/autoCompleteSearchBar/AutoCompleteSearchBar.jsx
@@ -25,13 +25,16 @@ import AutoSuggest from 'react-autosuggest';
 import Highlighter from 'react-highlight-words';
 import debounce from 'lodash.debounce';
 import {ButtonGroup} from 'react-bootstrap';
+import Modal from 'react-bootstrap/lib/Modal';
 import {Link} from 'react-router-dom';
+import {genericRequest} from 'app/networking/NetworkCalls.js';
 
 import {changeUrlAddress} from 'utils/Routes.js';
 
 import {
   ICON_CLASS_SEARCH,
   ICON_CLASS_CLEAR,
+  ICON_CLASS_HELP,
   SEARCH_DEBOUNCE_TIME,
   NO_MATCHES_FOUND,
   SEARCH_PLACEHOLDER_TEXT
@@ -45,6 +48,15 @@ export default class AutoCompleteSearchBar extends Component {
     suggestionName: PropTypes.string
   };
 
+  constructor(props) {
+    console.log(props);
+    super(props);
+    this.state = {
+      helpModalShow: false,
+      searchable: []
+    };
+  };
+
   componentWillMount() {
     this.debouncedLoadSuggestions =
       debounce(this.props.onSuggestionsFetchRequested, SEARCH_DEBOUNCE_TIME);
@@ -107,9 +119,40 @@ export default class AutoCompleteSearchBar extends Component {
       onChange: onInputChange
     };
 
+    let closeHelpModal = () => {
+      this.setState({helpModalShow: false});
+    };
+    let showHelpModal = () => {
+      genericRequest('/schema/searchable', true, 'GET').then(res=>{
+        let searchDOM =  res.sort(function(a, b) {
+          var compareA = (a['node-type']).toLowerCase();
+          var compareB = (b['node-type']).toLowerCase();
+          if(compareA < compareB){
+            return -1;
+          };
+          if(compareA > compareB){
+            return 1;
+          };
+          return 0;
+        }).map((prop) => {
+          return (
+            <div><p><strong>{prop['node-type']}:</strong></p><p>{prop['searchable-attributes']}</p></div>
+          );
+        });
+        this.setState({searchable: searchDOM, helpModalShow: true});
+      }, error => {
+        console.log(error);
+        this.setState({searchable: 'An error occurred, please try again later.', helpModalShow: true});
+      }).catch(error => {
+        console.log(error);
+        this.setState({searchable: 'An error occurred, please try again later.', helpModalShow: true});
+      });
+    };
+
     let clearButtonClass = (value.length > 0)
       ? 'auto-complete-clear-button'
       : 'auto-complete-clear-button hidden';
+
     return (
       <div className='auto-complete-search'>
         <AutoSuggest
@@ -127,10 +170,12 @@ export default class AutoCompleteSearchBar extends Component {
           renderSuggestionsContainer={this.renderSuggestionsContainer}/>
         <ButtonGroup className='auto-complete-search-button-group'>
           <Button type='submit' className={clearButtonClass}
-                  onClick={onClearSuggestionsTextFieldRequested}>
+            onClick={onClearSuggestionsTextFieldRequested}>
             <i className={ICON_CLASS_CLEAR} aria-hidden='true'/>
           </Button>
-
+          <Button type='submit' className='auto-complete-help-button' onClick={showHelpModal}>
+            <i className={ICON_CLASS_HELP} aria-hidden='true'/>
+          </Button>
           <Button type='submit' className='auto-complete-search-button' onClick={() => {
             this.newSearchSelected(this.getSelectedSuggestionObj(value, cachedSuggestions),
               onInvalidSearch, dispatchAnalytics, value);
@@ -139,6 +184,21 @@ export default class AutoCompleteSearchBar extends Component {
             <i className={ICON_CLASS_SEARCH} aria-hidden='true'/>
           </Button>
         </ButtonGroup>
+        <div className='static-modal'>
+          <Modal show={this.state.helpModalShow} onHide={closeHelpModal}>
+            <Modal.Header>
+            	<Modal.Title>Searchable Fields</Modal.Title>
+            </Modal.Header>
+            <Modal.Body>
+              <div className='modal-searchable'>
+                {this.state.searchable}
+              </div>
+            </Modal.Body>
+            <Modal.Footer>
+            	<Button onClick={closeHelpModal}>Close</Button>
+            </Modal.Footer>
+          </Modal>
+        </div>
       </div>
     );
   }
diff --git a/src/generic-components/autoCompleteSearchBar/AutoCompleteSearchBarConstants.js b/src/generic-components/autoCompleteSearchBar/AutoCompleteSearchBarConstants.js
index 975584a..a836275 100644
--- a/src/generic-components/autoCompleteSearchBar/AutoCompleteSearchBarConstants.js
+++ b/src/generic-components/autoCompleteSearchBar/AutoCompleteSearchBarConstants.js
@@ -35,3 +35,4 @@ export const SEARCH_DEBOUNCE_TIME = 300;
 
 export const ICON_CLASS_SEARCH = 'fa fa-search fa-lg';
 export const ICON_CLASS_CLEAR = 'fa fa-times fa-lg';
+export const ICON_CLASS_HELP = 'fa fa-question-circle fa-lg';
diff --git a/src/generic-components/filter/Filter.jsx b/src/generic-components/filter/Filter.jsx
new file mode 100644
index 0000000..2270665
--- /dev/null
+++ b/src/generic-components/filter/Filter.jsx
@@ -0,0 +1,270 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, {Component} from 'react';
+import Col from 'react-bootstrap/lib/Col';
+import Row from 'react-bootstrap/lib/Row';
+import Grid from 'react-bootstrap/lib/Grid';
+import AddFilters from './components/AddFilters.jsx';
+import ClearFilter from './components/ClearFilter.jsx';
+import RunFilterQuery from './components/RunFilterQuery.jsx';
+import SelectFilter from './components/SelectFilter.jsx';
+import FilterTypes from './components/FilterTypes.jsx';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+let APERTURE_SERVICE = JSON.parse(sessionStorage.getItem(GlobalExtConstants.ENVIRONMENT + 'APERTURE_SERVICE'));
+
+class Filter extends Component {
+  constructor(props){
+    super(props);
+    APERTURE_SERVICE=JSON.parse(sessionStorage.getItem(GlobalExtConstants.ENVIRONMENT + 'APERTURE_SERVICE'));
+  };
+  state = {
+    filterList: this.props.filterList,
+    filterSelected: this.props.nodeType,
+    filterDisplay: 'Select Filter' ,
+    filterTypeDisplay: 'Filter Type',
+    errorMsg: '',
+    showFilter:(this.props.filterMessage && this.props.filterMessage.length > 0) ? true : false,
+    filterMessage:this.props.filterMessage,
+    filterValue:'',
+    filterSelectedList:this.props.filterSelectedList,
+    isRunEnable:this.props.isRunEnable,
+    enableRealTime:JSON.parse(sessionStorage.getItem(GlobalExtConstants.ENVIRONMENT + 'ENABLE_ANALYSIS'))
+  };    
+  componentDidMount(){
+    console.log('Filter component  mount');    
+  };
+  componentWillReceiveProps(){
+    console.log('filter component  componentWillReceiveProps');
+    this.setState({
+      filterDisplay:this.props.filterDisplay,
+      filterTypeDisplay:this.props.filterTypeDisplay,
+      errorMsg:(this.props.errorMsg) ? this.props.errorMsg : '',
+      filterSelected:this.props.nodeType,
+      showFilter:(this.props.filterMessage && this.props.filterMessage.length > 0) ? true : false,
+      filterMessage: this.props.filterMessage,
+      filterValue:'',
+      filterSelectedList:this.props.filterSelectedList,
+      enableRealTime:JSON.parse(sessionStorage.getItem(GlobalExtConstants.ENVIRONMENT + 'ENABLE_ANALYSIS'))
+    });
+  }
+  renderFilterMessage = (props) => {
+    console.log('Filter render Filter Message>>>>>',props.showFilter);
+    if(props.showFilter){          
+    	const filters = props.filterSelectedList.map( (filterMsg,index) =>{
+        let filterType=(this.state.enableRealTime && filterMsg.type ==='=')? 'CONTAINS' : filterMsg.type;     
+        return (
+          <div className = 'badgeFilter' key={index}>
+           <span><b>{filterMsg.id}</b>&nbsp;<i>{filterType}</i>&nbsp;{filterMsg.value}</span>
+            <button type='button' className='close' aria-label='Close' onClick={() => this.onRemoveFilters(filterMsg.id.trim(),filterMsg.value.trim(),filterMsg.type)}>
+               <span aria-hidden='true'>&times;</span>
+            </button>
+          </div>
+        );
+      });
+      console.log('render Filter Message>>>>>before return ');
+      return(
+        <Row className='show-grid topBottomMargin'>
+            <Col md={12} className='removeLeftPadding'>
+                { filters }        
+            </Col> 
+        </Row>
+      );
+      console.log('Filter render Filter Message>>>>>After return ');    
+    }    
+  };    
+  renderError = (props) => {
+    if(props.errorMsg) {
+      return(
+        <Row className='show-grid topBottomMargin'>
+          <span className='label badge-pill label-danger topBottomMargin'><strong>Error </strong>: {this.state.errorMsg}</span>
+        </Row>
+      );
+    }
+  };
+  filterClearAllButtonSelectedHandler = () => {
+    console.log('clear all called');
+    if(this.state.isRunEnable || this.state.filterMessage.length === 0){
+      this.setState(
+        {
+          filterDisplay: 'Select Filter',
+          filterTypeDisplay: 'Filter Type',
+          errorMsg: '',
+          filterMessage: [],
+          filterValue:'',
+          filterSelectedList:[]
+        }
+      );
+    }else{
+      var tempState = this.state;
+      tempState.filterMessage = [];
+      tempState.filterSelectedList = [];
+      tempState.filterValue = ''; 
+      tempState.errorMsg = '';
+      tempState.filterDisplay = 'Select Filter';
+      tempState.filterTypeDisplay = 'Filter Type';
+      this.setState(tempState,function(){this.props.loadInventory(tempState);});
+    }
+    
+  };
+  filterAddButtonSelectedHandler = () => {
+    console.log('add Filter called');
+    var found = this.isContaining(this.state.filterDisplay, this.state.filterSelectedList);
+    console.log('filterAddButtonSelectedHandler>>>>>found',found);
+    this.errorMsg = null;
+    let filterDisplayState = true;
+    if(this.state.enableRealTime){
+      if(this.state.filterTypeDisplay !== 'Filter Type'){
+        filterDisplayState = true;
+      }else{
+        filterDisplayState = false;
+      }
+    }
+    if (this.state.filterDisplay !== 'Select Filter' && filterDisplayState && this.state.filterValue && !found){
+      console.log('filterAddButtonSelectedHandler>>>>>inside',this.state.filterValue);
+      var tempState = this.state;
+      if(this.state.enableRealTime){
+        tempState.filterMessage.push(this.state.filterDisplay + this.state.filterTypeDisplay +this.state.filterValue);
+        tempState.filterSelectedList.push({'id' : this.state.filterDisplay, 'value' : this.state.filterValue,'type': this.state.filterTypeDisplay});
+      }else{
+        tempState.filterMessage.push(this.state.filterDisplay + '=' +this.state.filterValue);
+        tempState.filterSelectedList.push({'id' : this.state.filterDisplay, 'value' : this.state.filterValue,'type': '='});
+      }
+      tempState.filterDisplay = 'Select Filter';
+      tempState.filterTypeDisplay = 'Filter Type';
+      tempState.filterValue = '';
+      tempState.showFilter = true;  
+      tempState.errorMsg = '';               
+      console.log('filterAddButtonSelectedHandler>>>>>tempState',tempState);            
+      if(this.state.isRunEnable) {
+        this.setState(tempState); 
+      }else{
+        this.setState(tempState,function(){this.props.loadInventory(tempState);});
+      }
+    }else{
+      console.log('filterAddButtonSelectedHandler>>>>>Else',this.state.filterDisplay);
+      console.log('filterAddButtonSelectedHandlerfilterTypeDisplay>>>>>Else',this.state.filterTypeDisplay);
+      console.log('this.state.filterValue>>>>>>>>>>>>>>',this.state.filterValue);
+      if(found){
+        this.setState({errorMsg: 'Please remove the current filter for this field before trying to add another.'});
+      }else if ( this.state.filterDisplay === 'Select Filter'){
+        this.setState({errorMsg: 'Please select a filter.'});
+      }else if (this.state.enableRealTime && this.state.filterTypeDisplay === 'Filter Type'){
+        this.setState({errorMsg: 'Please select a filter type.'});
+      }else{
+        this.setState({errorMsg: 'Please validate your filter, there seems to be an issue.'});
+      }
+    }
+  };
+  isContaining(nameKey, listArray){
+    var found = false;    
+    if(listArray) {  
+    listArray.map((lists) => {      
+      if(lists.id === nameKey){
+        console.log('foundName key in list',lists.id);      
+        found = true;
+      }
+    });    
+    }  
+    return found;
+  };
+  onTargetMenuSelect = (listName) => {
+    console.log('onTargetMenuSelect',listName);
+    this.setState({filterDisplay:listName,errorMsg:''});
+  };
+  onTargetMenuOfFilterTypes = (listName) => {
+    console.log('onTargetMenuOfFilterTypes',listName);
+    this.setState({filterTypeDisplay:listName,errorMsg:''});
+  }
+  onInputDataChange = (event) =>{
+    console.log('inputtext',event.target.value);
+    this.setState({filterValue:event.target.value});
+  };
+  onRemoveFilters = (filter,filterText,filterType) => {
+    console.log('onRemoveFilters',this.state.filterSelectedList);
+    var found = this.isContaining(filter, this.state.filterSelectedList);
+    console.log('onRemoveFilters.....found',found);
+    if(found){
+      const filterList = this.state.filterSelectedList.filter(function(el) {
+        console.log('el.id',el.id);
+        return el.id !== filter;
+      });
+      console.log('onRemoveFilters.....filterList',filterList);
+      let message = filter + filterType + filterText;
+      const filterMsgList = this.state.filterMessage.filter((el) =>{
+        return el !== message;
+      }); 
+      console.log('onRemoveFilters.....filterMsgList',filterMsgList);
+      if(this.state.isRunEnable) {
+        this.setState({filterSelectedList:filterList,filterValue:'',filterMessage:filterMsgList,errorMsg:''}); 
+      }else{
+        var tempState = this.state;
+        tempState.filterMessage = filterMsgList;
+        tempState.filterSelectedList = filterList;
+        tempState.filterValue = ''; 
+        tempState.errorMsg = ''; 
+        this.setState(tempState,function(){this.props.loadInventory(tempState);});
+      }          
+    }
+  };
+  render(){
+    let filterTags ='';
+    if(APERTURE_SERVICE && this.state.enableRealTime){
+      console.log('before passing Filter>*',this.state);
+      filterTags= <Col md={(this.state.isRunEnable) ? 2 : 2} className='removeLeftPadding'>
+                    <FilterTypes param={this.state}
+                      filterList={this.props.filterList} 
+                      onMenuSelect={this.onTargetMenuOfFilterTypes} />
+                  </Col>                      
+    }
+    return(
+        <div id='filterPane' className={this.props.isFilterEnable ? 'show' : 'hidden'}>
+            <Grid className='custom-container'>
+                <Row className='show-grid topBottomMargin'>
+                    <Col md={(this.state.isRunEnable) ? 3 : 2} className='removeLeftPadding'>
+                        <SelectFilter param={this.state} 
+                            filterList={this.props.filterList} 
+                            onMenuSelect={this.onTargetMenuSelect} />
+                    </Col>
+                    {filterTags}                  
+                    <Col md={(this.state.isRunEnable) ? 7 : 8}>
+                        <input type='text' size='36' 
+                            onBlur={(event) => this.onInputDataChange(event)} 
+                            placeholder='Please Enter Filter text' 
+                            value={this.state.filterValue}
+                            onChange={(event) => this.onInputDataChange(event)} />
+                        <AddFilters param={this.state} 
+                            addHandler={this.filterAddButtonSelectedHandler} />
+                        <ClearFilter param={this.state} clearAllHandler={this.filterClearAllButtonSelectedHandler} />
+                        <RunFilterQuery param={this.state} />
+                    </Col>
+                </Row>
+                {
+                    this.renderError(this.state)
+                }
+                {
+                    this.renderFilterMessage(this.state)
+                }
+            </Grid>
+        </div>
+    );
+  }
+}
+export default Filter;
diff --git a/src/generic-components/filter/components/AddFilters.jsx b/src/generic-components/filter/components/AddFilters.jsx
new file mode 100644
index 0000000..4b0aa7b
--- /dev/null
+++ b/src/generic-components/filter/components/AddFilters.jsx
@@ -0,0 +1,27 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+ import React from 'react';
+
+const AddFilters = (props) => (
+    <button type='button' className='btn btn-primary' onClick={props.addHandler}>Add Filter</button>
+);
+
+export default AddFilters;
diff --git a/src/generic-components/filter/components/ClearFilter.jsx b/src/generic-components/filter/components/ClearFilter.jsx
new file mode 100644
index 0000000..e231ab8
--- /dev/null
+++ b/src/generic-components/filter/components/ClearFilter.jsx
@@ -0,0 +1,27 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React from 'react';
+
+const ClearFilter = (props) => (
+    <button type='button' className='btn btn-secondary' onClick={props.clearAllHandler}>Clear Filters</button>
+);
+
+export default ClearFilter;
diff --git a/src/generic-components/filter/components/FilterTypes.jsx b/src/generic-components/filter/components/FilterTypes.jsx
new file mode 100644
index 0000000..c25749d
--- /dev/null
+++ b/src/generic-components/filter/components/FilterTypes.jsx
@@ -0,0 +1,102 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, {Component} from 'react';
+import DropdownButton from 'react-bootstrap/lib/DropdownButton';
+import Dropdown from 'react-bootstrap/lib/Dropdown';
+import MenuItem from 'react-bootstrap/lib/MenuItem';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+var filterTypeList = GlobalExtConstants.FILTER_TYPES;
+
+class FilterTypes extends Component {
+	constructor(props) {
+		console.log('FilterTypes props>>>>',props);
+        super(props);
+        this.props = props;
+        this.state = {dropdownIsOpen : false, isInitialize: true}
+    }
+    componentWillReceiveProps (nextProps) {
+        console.log('next props componentWillReceiveProps>>>>>>>',nextProps);
+        console.log('tihs props componentWillReceiveProps>>>>>>>',this.props);
+        if(this.state.isInitialize || this.props !== nextProps){    
+            this.props=nextProps;           
+            this.setState({isInitialize:false}, ()=>{this.updateDropDownState();});                 
+        }
+        console.log('this.state under Update>>>>>',this.state);
+    }
+    handleDropdownValues = (props) => {
+        const listItems = Object.keys(filterTypeList).map((filter,index) => {
+          return(    
+              <MenuItem 
+                      eventKey={index} 
+                      key={filter}> 
+                      {filterTypeList[index]} 
+              </MenuItem>
+          );
+        }); 
+        return (    
+          listItems
+        );
+    };
+    toggleDropdown = () => {
+        console.log('toggleDropdown>>>>>',this.state.dropdownIsOpen);
+        this.setState({ dropdownIsOpen: !this.state.dropdownIsOpen },()=>{this.updateDropDownState()});
+    };
+    updateDropDownState = () =>{
+        console.log('updateDropDownState',this.state.dropdownIsOpen);
+        //document.dispatchEvent(new MouseEvent('click'));
+        let id=(this.props.id)? 'dropdown-root-'+this.props.id :'dropdown-root-2'
+        if(this.state.dropdownIsOpen){
+            document.getElementById(id).getElementsByClassName('dropdown-menu')[0].style.display='block';
+        }else{
+            document.getElementById(id).getElementsByClassName('dropdown-menu')[0].style.display='none';
+        }        
+    }
+    handleSelect(eventKey, event) {
+        Object.keys(filterTypeList).map((filter,index) => {
+            if(eventKey === index){
+                this.props.onMenuSelect(filterTypeList[index],this.props.id)
+            }        
+        });     
+     }
+    render(){
+        if(this.state.isInitialize){
+            this.setState({isInitialize:false},()=>{this.updateDropDownState();});
+        }
+        return(
+            <div id={(this.props.id)? 'dropdown-root-'+this.props.id :'dropdown-root-2'}>
+                <DropdownButton
+                    bsStyle='primary'
+                    title= {(this.props.selectedFilter)? this.props.selectedFilter: this.props.param.filterTypeDisplay}
+                    key= '2'
+                    id={(this.props.id)? 'dropdown-basic-'+this.props.id :'dropdown-basic-2'} 
+                    className='dropdownButton'
+                    onToggle={this.toggleDropdown} 
+                    disabled={(this.props.state)?this.props.state:false} 
+                    onSelect={this.handleSelect.bind(this)}  >
+                    { 
+                        this.handleDropdownValues(this.props)
+                    }
+                </DropdownButton>
+            </div>
+        )
+    }
+}
+export default FilterTypes;
diff --git a/src/generic-components/filter/components/RunFilterQuery.jsx b/src/generic-components/filter/components/RunFilterQuery.jsx
new file mode 100644
index 0000000..5b81769
--- /dev/null
+++ b/src/generic-components/filter/components/RunFilterQuery.jsx
@@ -0,0 +1,56 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React from 'react';
+import {Link} from 'react-router-dom';
+//import {BrowserRouter} from 'react-router-dom';
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+let URI_DELIMITCHAR = GlobalExtConstants.URI_DELIMITCHAR;
+
+var prepareURI = (props) => {
+  console.log('prepare URI');
+  let URI = '/model/' + props.filterSelected;
+  let filterList = props.filterSelectedList;
+  if(filterList){
+    for (var key in filterList){
+      if(filterList.hasOwnProperty(key)){
+        URI += ';' + filterList[key].id + URI_DELIMITCHAR + filterList[key].type + URI_DELIMITCHAR + filterList[key].value;
+      }
+    }
+  }
+  return (
+    URI
+  ); 
+};
+const RunFilterQuery = (props) => {
+  if(props.param.isRunEnable){ 
+    return(  
+      <Link to={prepareURI(props.param)}> 
+        <button type='button' className='btn btn-warning'>Run </button>
+      </Link>
+    );
+  }else{
+    return(
+        <span></span>
+    );
+  }
+};
+
+export default RunFilterQuery;
diff --git a/src/generic-components/filter/components/SelectFilter.jsx b/src/generic-components/filter/components/SelectFilter.jsx
new file mode 100644
index 0000000..94f1807
--- /dev/null
+++ b/src/generic-components/filter/components/SelectFilter.jsx
@@ -0,0 +1,100 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import React, {Component} from 'react';
+import DropdownButton from 'react-bootstrap/lib/DropdownButton';
+import MenuItem from 'react-bootstrap/lib/MenuItem';
+
+class SelectFilter extends Component {
+	constructor(props) {
+		console.log('SelectFilter props',props);
+        super(props);
+        this.props = props;
+        this.state = {dropdownIsOpen : false, isInitialize: true}
+    }    
+    componentWillReceiveProps (nextProps) {
+        console.log('next props componentWillReceiveProps>>>>>>>',nextProps);
+        console.log('tihs props componentWillReceiveProps>>>>>>>',this.props);
+        if(this.state.isInitialize || this.props.id !== nextProps.id){       
+            this.props=nextProps;
+            this.setState({isInitialize:false},()=>{this.updateDropDownState();});                 
+        }
+        console.log('this.state under Update>>>>>',this.state);
+    }
+    
+    handleDropdownValues = (props) => {
+        const listItems = Object.keys(props.filterList).map((filter,index) => {
+          let filterValue=(props.filterList[index].value)?props.filterList[index].value:props.filterList[index];
+          let description=(props.filterList[index].description)?props.filterList[index].description:'';
+          return(    
+              <MenuItem eventKey={index} key={index} title={description}>{filterValue}</MenuItem>
+          );
+        }); 
+        console.log('listItems',listItems); 
+        return (    
+          listItems
+        );
+    };    
+    toggleDropdown = () => {
+        console.log('toggleDropdown>>>>>',this.state.dropdownIsOpen);
+        this.setState({ dropdownIsOpen: !this.state.dropdownIsOpen },()=>{this.updateDropDownState();});
+    };
+    updateDropDownState = () =>{
+        console.log('updateDropDownState',this.state.dropdownIsOpen);
+        //document.dispatchEvent(new MouseEvent('click'));dropdownIsOpen
+        let id=(this.props.id)? 'dropdown-root-'+this.props.id :'dropdown-root-1'
+        if(this.state.dropdownIsOpen){
+            document.getElementById(id).getElementsByClassName('dropdown-menu')[0].style.display='block';
+        }else{
+            document.getElementById(id).getElementsByClassName('dropdown-menu')[0].style.display='none';
+        }                
+    }
+    handleSelect(eventKey, event) {
+       Object.keys(this.props.filterList).map((filter,index) => {
+           if(eventKey === index){
+                let filterValue=(this.props.filterList[index].value)?this.props.filterList[index].value:this.props.filterList[index];
+                this.props.onMenuSelect(filterValue,this.props.id)
+           }        
+       });    
+    }
+    render(){
+        if(this.state.isInitialize){
+            this.setState({isInitialize:false},()=>{this.updateDropDownState();});
+        }
+        return(
+            <div id={(this.props.id)? 'dropdown-root-'+this.props.id :'dropdown-root-1'}>
+                <DropdownButton
+                    bsStyle='primary'
+                    title= {(this.props.selectedFilter)? this.props.selectedFilter: this.props.param.filterDisplay}
+                    key= '1'
+                    id={(this.props.id)? 'dropdown-basic-'+this.props.id :'dropdown-basic-1'} 
+                    className='dropdownButton'
+                    onToggle={this.toggleDropdown}
+                    onSelect={this.handleSelect.bind(this)}                    
+                    >
+                    { 
+                        this.handleDropdownValues(this.props)
+                    }           
+                </DropdownButton>
+            </div>
+        );
+    }
+}
+export default SelectFilter;
diff --git a/src/utils/CSV.js b/src/utils/CSV.js
new file mode 100644
index 0000000..d570ddb
--- /dev/null
+++ b/src/utils/CSV.js
@@ -0,0 +1,348 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import {GlobalExtConstants} from './GlobalExtConstants.js';
+let OXM = GlobalExtConstants.OXM;
+
+function camelToDash(str) {
+  return (str.replace(/\W+/g, '-')
+    .replace(/([a-z\d])([A-Z])/g, '$1-$2')).toLowerCase();
+}
+
+function sortColumn(col1, col2) {
+  if (col1.value < col2.value) {
+    return -1;
+  } else if (col1.value > col2.value) {
+    return 1;
+  } else {
+    return 0;
+  }
+}
+
+var  buildAttrList = function(inputParam, cols) {
+  // console.log('[getSearchParam] inputParam: ' + inputParam);
+  let searchParam = inputParam;
+
+  if (['PSERVER', 'COMPLEX', 'CLOUDREGION',
+    'NETWORKPROFILE', 'VIRTUALDATACENTER'].indexOf(inputParam.toUpperCase()) === -1) {
+    searchParam = inputParam.substring(0, inputParam.length - 1);
+    // console.log('[getSearchParam] searchParam: ' + searchParam);
+  }
+  console.log('Before loop included',searchParam);
+  if('CHASSIES'.indexOf(inputParam.toUpperCase()) !== -1){
+    searchParam = inputParam.substring(0, inputParam.length - 2) + 's';
+  }else if(inputParam.substr(inputParam.length - 3) === 'ies'){
+    searchParam = inputParam.substring(0, inputParam.length - 3) + 'y';
+  }else if('COMPLEXES'.indexOf(inputParam.toUpperCase()) !== -1){
+    searchParam = inputParam.substring(0, inputParam.length - 2);
+  }
+  if(inputParam.toUpperCase() === 'PINTERFACES'){
+    searchParam = 'pInterface';
+  }
+  console.log('After loop included',searchParam);
+  if (inputParam.toUpperCase() === 'LINESOFBUSINESS') {
+    searchParam = 'lineOfBusiness';
+    // console.log('[getSearchParam] searchParam: ' + searchParam);
+  }
+
+  // read oxm xml file
+  let oxmFile = JSON.parse(OXM);
+  let javaTypes = oxmFile['xml-bindings']['java-types'][0]['java-type'];
+  // console.log('[buildAttrList] javaTypes:');
+  // console.log(javaTypes);
+
+  let foundIndex = -1;
+  for (let i = 0; i < javaTypes.length && foundIndex === -1; i++) {
+    if (javaTypes[i]['xml-root-element'][0]['$']['name'] === camelToDash(searchParam)) {
+      // console.log(javaTypes[i]);
+      foundIndex = i;
+    }
+  }
+  
+  //Adding Quick fix will be get rid of it later
+  console.log('searchParam>>>>>>>stage2:',inputParam);
+  if(foundIndex === -1){
+   for (let i = 0; i < javaTypes.length && foundIndex === -1; i++) {
+     if (javaTypes[i]['xml-root-element'][0]['$']['name'] === camelToDash(inputParam)) {
+       foundIndex = i;
+     }
+     if(foundIndex === -1){
+       if(inputParam.substr(inputParam.length - 1) === 's'){
+         searchParam = inputParam.substring(0, inputParam.length - 1);
+         console.log('searchParam>>>>>>>stage3:',searchParam);        
+       }
+       if (javaTypes[i]['xml-root-element'][0]['$']['name'] === camelToDash(searchParam)) {
+         foundIndex = i;
+       }
+     }
+   }
+  }
+ 
+  // build the column list
+  let columns = cols;
+  if(foundIndex > -1) {
+    //for (let j = 0; j < javaTypes[foundIndex]['java-attributes'][0]['xml-element'].length; j++) {
+     // columns.push({value: javaTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['$']['name']});
+    //}
+    if (javaTypes[foundIndex]['java-attributes']) {
+      let elementLength = 0;
+      if (javaTypes[foundIndex]['java-attributes'][0]['xml-element']) {
+        elementLength = javaTypes[foundIndex]['java-attributes'][0]['xml-element'].length;
+      }
+      for (var j = 0; j < elementLength; j++) {
+        let isPrimitive = JSON.stringify(javaTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['$']['type']).indexOf('java.lang') > -1;
+        if(isPrimitive) { //add to the list
+          let node = {value: javaTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['$']['name']};
+          columns.push(node);
+        }
+      }
+    }
+  }
+
+  //sort the column list
+  columns.sort(sortColumn);
+
+  // console.log('[buildAttrList] columns:');
+  // console.log(columns);
+
+  return columns;
+}
+
+var multiTypeBuildAttrList = function(nodes) {
+  // read oxm xml file
+  let oxmFile = JSON.parse(OXM);
+  let javaTypes = oxmFile['xml-bindings']['java-types'][0]['java-type'];
+
+  let typeList = new Map();
+
+  nodes.forEach(node => {
+    let searchParam = node['node-type'];
+
+    let foundIndex = -1;
+    for (let i = 0; i < javaTypes.length && foundIndex === -1; i++) {
+      if (javaTypes[i]['xml-root-element'][0]['$']['name'] === camelToDash(searchParam)) {
+        foundIndex = i;
+        if (!typeList.has(searchParam)) {
+
+          let props = [];
+          //for (let j = 0; j < javaTypes[foundIndex]['java-attributes'][0]['xml-element'].length; j++) {
+            //props.push({
+              //value: javaTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['$']['name']
+            //});
+          //}
+          if (javaTypes[foundIndex]['java-attributes']) {
+            let elementLength = 0;
+            if (javaTypes[foundIndex]['java-attributes'][0]['xml-element']) {
+              elementLength = javaTypes[foundIndex]['java-attributes'][0]['xml-element'].length;
+            }
+            for (var j = 0; j < elementLength; j++) {
+              let isPrimitive = JSON.stringify(javaTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['$']['type']).indexOf('java.lang') > -1;
+              if(isPrimitive) { //add to the list
+                let node = {value: javaTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['$']['name']};
+                props.push(node);
+              }
+            }
+          }
+
+          props.sort(sortColumn);
+          typeList.set(searchParam, props);
+        }
+      }
+    }
+  });
+
+  // console.log('typeList:');
+  // console.log(typeList);
+
+  return typeList;
+}
+
+var buildCSV = function(columns, nodes) {
+  let outputArray = [];
+  outputArray[0] = [];
+
+  for (let i = 0; i < columns.length; i++) {
+    let str = columns[i].value;
+    outputArray[0][str] = columns[i];
+  }
+
+  // console.log('[buildCSV] initial outputArray with columns:');
+  // console.log(outputArray);
+
+  // console.log('[buildCSV] nodes.length:');
+  // console.log(nodes.length);
+
+  let q = 0;
+  for (let j = 1; j < nodes.length + 1; j++) {
+    outputArray[j] = [];
+    for (var k in nodes[q].properties) {
+      if (nodes[q].properties.hasOwnProperty(k)) {
+        let str = k;
+        outputArray[j][str] = nodes[q].properties[k].toString();
+      }
+    }
+    let relative = nodes[q]['related-to'];
+    for(var r = 0; r<relative.length; r++){
+      var relationship = '';
+      var relationshipLabel = '';
+      var nodeType = '';
+      var url = '';
+      for(var k in relative[r]){
+        let relation = k.toString();
+        if(relation === 'relationship-label'){
+          relationshipLabel = relative[r][k].toString().slice(33);
+        }
+        if(relation === 'node-type'){
+          nodeType = relative[r][k].toString();
+        } 
+        if(relation === 'url'){
+          url = relative[r][k].toString();
+        }       
+        relationship = 'Relationship ' + relationshipLabel + ' ' + nodeType + ' - ' + url;
+        console.log('relationship>>>>>',relationship);
+      }
+      let cnt = r + 1;
+      let str = 'Relationship' + cnt;      
+      outputArray[j][str] = relationship;
+      outputArray[0][str] ='Relationship'+cnt;
+    }
+    q++;
+  }
+
+  return outputArray;
+}
+
+var multiTypebuildCSV = function(nodes) {
+  let outputArray = [];
+
+  nodes.forEach(node => {
+    let nodeVal = [];
+    for (var prop in node.properties) {
+      if (node.properties.hasOwnProperty(prop)) {
+        let val = { value: prop + ': ' + node.properties[prop].toString()};
+        // console.log(val);
+        nodeVal.push(val);
+      }
+    }
+    nodeVal.sort(sortColumn);
+    nodeVal.unshift({ value: node['node-type'] }, {value : node.url });
+    let relative = node['related-to'];
+    for(var r = 0; r<relative.length; r++){
+      var relationship = '';
+      var relationshipLabel = '';
+      var nodeType = '';
+      var url = '';
+      for(var k in relative[r]){
+        let relation = k.toString();
+        if(relation === 'relationship-label'){
+          relationshipLabel = relative[r][k].toString().slice(33);
+        }
+        if(relation === 'node-type'){
+          nodeType = relative[r][k].toString();
+        } 
+        if(relation === 'url'){
+          url = relative[r][k].toString();
+        }       
+        relationship = 'Relationship ' + relationshipLabel + ' ' + nodeType + ' - ' + url;
+        console.log('relationship>>>>>',relationship);
+      }
+      let cnt = r + 1;  
+      let val = { value: 'Relationship'+cnt + ': ' + relationship};
+      nodeVal.push(val);
+    }
+    outputArray.push(nodeVal);
+  });
+
+  // console.log(outputArray);
+  return outputArray;
+}
+
+var convertToCSVStr = function(outputArray) {
+  let array = (typeof outputArray !== 'object' ? JSON.parse(outputArray) : outputArray);
+  let str = '';
+  let row = '';
+
+  for (let index in outputArray[0]) {
+    // convert each value to string and comma-separated
+    row += index + ',';
+  }
+  row = row.slice(0, -1);
+  // append Label row with line break
+  str += row + '\r\n';
+
+  for (let i = 1; i < array.length; i++) {
+    let line = '';
+    for (let k in outputArray[0]) {
+      if (outputArray[0].hasOwnProperty(k)) {
+        if (array[i][k]) {
+          line += array[i][k] + ',';
+        } else {
+          line += ',';
+        }
+      }
+    }
+    str += line + '\r\n';
+  }
+  return str;
+}
+
+var multiTypeConvertToCSVStr = function(outputArray) {
+  let array = (typeof outputArray !== 'object' ? JSON.parse(outputArray) : outputArray);
+  let str = '';
+  let max = 0;
+  // find max length of array to determine number of rows to loop through
+  array.forEach(node => {
+    if (node.length > max) {
+      max = node.length;
+    }
+  });
+
+  // console.log('max: ' + max);
+
+  for (let i = 0; i < max; i++) {
+    let line = '';
+    for (let j = 0; j < array.length; j++) {
+      line += array[j][i] ? array[j][i].value  + ',' : ',';
+    }
+    str += line + '\r\n';
+  }
+  return str;
+}
+
+var downloadCSV = function(csvStr, filename) {
+  // console.log(csvStr);
+  var a = document.createElement('a');
+  a.setAttribute('style', 'display:none;');
+  document.body.appendChild(a);
+  var blob = new Blob([csvStr], { type: 'text/csv' });
+  var url = window.URL.createObjectURL(blob);
+  a.href = url;
+  a.download = filename + '.csv';
+  a.click();
+}
+export const CSV = {
+  buildAttrList : buildAttrList,
+  multiTypeBuildAttrList : multiTypeBuildAttrList,
+  buildCSV : buildCSV,
+  multiTypebuildCSV : multiTypebuildCSV,
+  convertToCSVStr : convertToCSVStr,
+  multiTypeConvertToCSVStr : multiTypeConvertToCSVStr,
+  downloadCSV : downloadCSV
+};
diff --git a/src/utils/CommonAPIService.js b/src/utils/CommonAPIService.js
new file mode 100644
index 0000000..c7aea45
--- /dev/null
+++ b/src/utils/CommonAPIService.js
@@ -0,0 +1,131 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import axios from 'axios';
+import {GlobalExtConstants} from './GlobalExtConstants.js';
+
+const commonApi = (settings, path, httpMethodType, reqPayload, stubPath, overrideDomain, specialCase, additionalHeaders, noProxy) => {
+  let BASE_URL = GlobalExtConstants.BASE_URL;
+  const proxyConfig = {
+  //enter proxy details here for local
+    proxy : {
+      host: '',
+      port: ''
+    }
+  };
+
+  let SWITCH_URL = '';
+  let APERTURE_SERVICE = JSON.parse(sessionStorage.getItem(GlobalExtConstants.ENVIRONMENT + 'APERTURE_SERVICE'));
+  if(overrideDomain){
+    SWITCH_URL = overrideDomain + '/';
+    if(settings.ISTABULAR){
+      SWITCH_URL+= settings.TABULAR + '/'
+      + settings.PREFIX + '/'
+      + settings.APERTURE + '/'
+      + settings.TABULARVERSION + '/'
+      + path;
+    }else{
+      SWITCH_URL+= path;
+    }
+  }else if(APERTURE_SERVICE && (settings.ISAPERTURE !== undefined)){
+    let baseURL = (settings.NODESERVER) ? 'https://'+ settings.NODESERVER : BASE_URL;
+    SWITCH_URL = baseURL + '/';
+    if(!noProxy){
+        SWITCH_URL += settings.PROXY + '/';
+    }
+    SWITCH_URL += settings.PREFIX + '/'
+    + settings.APERTURE + '/';
+    if(settings.ISAPERTURE && settings.APERTURE_SERVICENAME !== undefined){
+      SWITCH_URL += settings.VERSION + '/'
+      + settings.APERTURE_SERVICENAME;
+    }else if(settings.ISAPERTURE){
+      SWITCH_URL += settings.VERSION + '/';
+    }
+    SWITCH_URL += path;    
+  }else if(settings.NODESERVER){
+    SWITCH_URL = 'https://'
+      + settings.NODESERVER + '/';
+      if(!noProxy){
+          SWITCH_URL += settings.PROXY + '/';
+      }
+      SWITCH_URL += settings.PREFIX + '/';
+      if(specialCase){
+         SWITCH_URL += specialCase + '/';
+      }
+     SWITCH_URL += settings.VERSION + '/'
+     + path;
+  }else{
+    SWITCH_URL = BASE_URL + '/';
+      if(!noProxy){
+          SWITCH_URL += settings.PROXY + '/';
+      }
+      SWITCH_URL += settings.PREFIX + '/';
+    if(specialCase){
+       SWITCH_URL += specialCase + '/';
+    }
+    SWITCH_URL += settings.VERSION + '/'
+         + path;
+  }
+  console.log('Making call to the backend >>>>>>>>>>>', SWITCH_URL);
+
+  var headers = {'Content-Type' : 'application/json','Access-Control-Allow-Origin' : '*','X-FromAppId':'AAI-UI', 'X-TransactionId' : 'AAI-UI', 'Accept':'application/json'};
+  if(additionalHeaders){
+    for(var i = 0; i < additionalHeaders.length; i++){
+        if(additionalHeaders[i].name && additionalHeaders[i].value){
+            headers[additionalHeaders[i].name] = additionalHeaders[i].value;
+        }else{
+            console.log("CommonAPIService :: Additional headers passed in are not in teh proper format: "+ JSON.stringify(additionalHeaders));
+        }
+    }
+  }
+  console.log("HEADER VALUES: "+ headers);
+  if(settings.USESTUBS){
+    return new Promise((resolve, reject) => {
+          var responseObj = {};
+          responseObj.data = require('app/assets/stubs/' + stubPath + '.json');
+          responseObj.status = 200;
+          responseObj.headers = [];
+          if(responseObj.data && responseObj.data.results){
+            responseObj.headers['total-results'] =  Object.keys(responseObj.data.results).length;
+            resolve(responseObj);
+          }else if(responseObj.data && ['BYOQPersonalQueries','BYOQCommunityQueries','BYOQPublicQueries','ConvertQueryToTree','SingleTransactionEdit'].indexOf(stubPath) > -1 ){
+            resolve(responseObj);
+          }else if(responseObj.data){
+            responseObj.headers['total-results'] =  0;
+            reject(responseObj.data);
+          }else{
+            reject('Error');
+          }
+      })
+  }else if (['PUT','PATCH','DELETE','POST'].indexOf(httpMethodType) > -1 && reqPayload !== null) {
+    return axios({ method: httpMethodType,
+      url: SWITCH_URL,
+      data: reqPayload,
+      headers: headers });
+  }else{
+    if(settings.NODESERVER){
+        return axios.get(SWITCH_URL, proxyConfig);
+    }else{
+        return axios.get(SWITCH_URL);
+    }
+  }
+};
+
+export default commonApi;
diff --git a/src/utils/DiffUtil.js b/src/utils/DiffUtil.js
new file mode 100644
index 0000000..5e69162
--- /dev/null
+++ b/src/utils/DiffUtil.js
@@ -0,0 +1,98 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+
+var deepDiffMapper = function() {
+    return {
+        VALUE_CREATED: 'created',
+        VALUE_UPDATED: 'updated',
+        VALUE_DELETED: 'deleted',
+        VALUE_UNCHANGED: 'unchanged',
+        map: function(obj1, obj2) {
+            if (this.isFunction(obj1) || this.isFunction(obj2)) {
+                throw 'Invalid argument. Function given, object expected.';
+            }
+            if (this.isValue(obj1) || this.isValue(obj2)) {
+                return {
+                    type: this.compareValues(obj1, obj2),
+                    data: (obj1 === undefined) ? obj2 : obj1
+                };
+            }
+
+            var diff = {};
+            for (var key in obj1) {
+                if (this.isFunction(obj1[key])) {
+                    continue;
+                }
+
+                var value2 = undefined;
+                if ('undefined' != typeof(obj2[key])) {
+                    value2 = obj2[key];
+                }
+
+                diff[key] = this.map(obj1[key], value2);
+            }
+            for (var key in obj2) {
+                if (this.isFunction(obj2[key]) || ('undefined' != typeof(diff[key]))) {
+                    continue;
+                }
+
+                diff[key] = this.map(undefined, obj2[key]);
+            }
+
+            return diff;
+
+        },
+        compareValues: function(value1, value2) {
+            if (value1 === value2) {
+                return this.VALUE_UNCHANGED;
+            }
+            if (this.isDate(value1) && this.isDate(value2) && value1.getTime() === value2.getTime()) {
+            		return this.VALUE_UNCHANGED;
+            }
+            if ('undefined' == typeof(value1)) {
+                return this.VALUE_CREATED;
+            }
+            if ('undefined' == typeof(value2)) {
+                return this.VALUE_DELETED;
+            }
+
+            return this.VALUE_UPDATED;
+        },
+        isFunction: function(obj) {
+            return {}.toString.apply(obj) === '[object Function]';
+        },
+        isArray: function(obj) {
+            return {}.toString.apply(obj) === '[object Array]';
+        },
+        isObject: function(obj) {
+            return {}.toString.apply(obj) === '[object Object]';
+        },
+        isDate: function(obj) {
+            return {}.toString.apply(obj) === '[object Date]';
+        },
+        isValue: function(obj) {
+            return !this.isObject(obj) && !this.isArray(obj);
+        }
+    }
+}();
+
+
+export default deepDiffMapper;
diff --git a/src/utils/ExportExcel.js b/src/utils/ExportExcel.js
new file mode 100644
index 0000000..7a4b096
--- /dev/null
+++ b/src/utils/ExportExcel.js
@@ -0,0 +1,394 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import {GlobalExtConstants} from './GlobalExtConstants.js';
+import * as Excel from 'exceljs/dist/exceljs.min.js';
+
+let OXM = GlobalExtConstants.OXM;
+let EXCELCELLS = GlobalExtConstants.EXCELCELLS;
+let DOWNLOAD_ALL = GlobalExtConstants.DOWNLOAD_ALL;
+let INVLIST = GlobalExtConstants.INVLIST;
+
+function camelToDash(str) {
+	return (str.replace(/\W+/g, '-')
+	  .replace(/([a-z\d])([A-Z])/g, '$1-$2')).toLowerCase();
+}
+  
+function sortColumn(col1, col2) {
+	if (col1.value < col2.value) {
+		return -1;
+	} else if (col1.value > col2.value) {
+		return 1;
+	} else {
+		return 0;
+	}
+}
+  
+var  buildAttrList = function(inputParam, cols, sortBy) {
+	// console.log('[getSearchParam] inputParam: ' + inputParam);
+	let searchParam = inputParam;
+  
+	if (['PSERVER', 'COMPLEX', 'CLOUDREGION',
+	  'NETWORKPROFILE', 'VIRTUALDATACENTER','VNFC'].indexOf(inputParam.toUpperCase()) === -1) {
+	  searchParam = inputParam.substring(0, inputParam.length - 1);
+	  // console.log('[getSearchParam] searchParam: ' + searchParam);
+	}
+	if('CHASSIES'.indexOf(inputParam.toUpperCase()) !== -1){
+	  searchParam = inputParam.substring(0, inputParam.length - 2) + 's';
+	}else if(inputParam.substr(inputParam.length - 3) === 'ies'){
+	  searchParam = inputParam.substring(0, inputParam.length - 3) + 'y';
+	}else if('COMPLEXES'.indexOf(inputParam.toUpperCase()) !== -1){
+	  searchParam = inputParam.substring(0, inputParam.length - 2);
+	}
+	if(inputParam.toUpperCase() === 'PINTERFACES'){
+	  searchParam = 'pInterface';
+	}
+	if (inputParam.toUpperCase() === 'LINESOFBUSINESS') {
+	  searchParam = 'lineOfBusiness';
+	  // console.log('[getSearchParam] searchParam: ' + searchParam);
+	}
+  
+	// read oxm xml file
+	let oxmFile = JSON.parse(OXM);
+	let javaTypes = oxmFile['xml-bindings']['java-types'][0]['java-type'];
+	// console.log('[buildAttrList] javaTypes:');
+	// console.log(javaTypes);
+  
+	let foundIndex = -1;
+	for (let i = 0; i < javaTypes.length && foundIndex === -1; i++) {
+	  if (javaTypes[i]['xml-root-element'][0]['$']['name'] === camelToDash(searchParam)) {
+		// console.log(javaTypes[i]);
+		foundIndex = i;
+	  }
+	}
+	
+	//Adding Quick fix will be get rid of it later
+	console.log('searchParam>>>>>>>stage2:',inputParam);
+	if(foundIndex === -1){
+	 for (let i = 0; i < javaTypes.length && foundIndex === -1; i++) {
+	   if (javaTypes[i]['xml-root-element'][0]['$']['name'] === camelToDash(inputParam)) {
+		 foundIndex = i;
+	   }
+	   if(foundIndex === -1){
+		 if(inputParam.substr(inputParam.length - 1) === 's'){
+		   searchParam = inputParam.substring(0, inputParam.length - 1);
+		   console.log('searchParam>>>>>>>stage3:',searchParam);        
+		 }
+		 if (javaTypes[i]['xml-root-element'][0]['$']['name'] === camelToDash(searchParam)) {
+		   foundIndex = i;
+		 }
+	   }
+	 }
+	}
+   
+	// build the column list
+	let columns = cols;
+  let requiredColumn = [];
+	if(foundIndex > -1) {
+	  //for (let j = 0; j < javaTypes[foundIndex]['java-attributes'][0]['xml-element'].length; j++) {
+	   // columns.push({value: javaTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['$']['name']});
+	  //}
+	  if (javaTypes[foundIndex]['java-attributes']) {
+		let elementLength = 0;
+		if (javaTypes[foundIndex]['java-attributes'][0]['xml-element']) {
+		  elementLength = javaTypes[foundIndex]['java-attributes'][0]['xml-element'].length;
+		}
+		for (var j = 0; j < elementLength; j++) {
+		  let isPrimitive = JSON.stringify(javaTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['$']['type']).indexOf('java.lang') > -1;
+      let reqObj = JSON.stringify(javaTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['$']['required']);
+      let description='';
+      if(javaTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['xml-properties'] && javaTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['xml-properties'][0]['xml-property'][0]['$']['name']=='description'){
+        description= javaTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['xml-properties'][0]['xml-property'][0]['$']['value'];
+      }
+      let node = {value: javaTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['$']['name'],description: description};
+      if(isPrimitive) { //add to the list
+			  columns.push(node);
+		  }
+		  if(reqObj && reqObj.indexOf('true') > -1){
+		       requiredColumn.push(node);
+		  }
+		}
+	  }
+	}
+  
+	//sort the column list
+	columns.sort(sortColumn);
+	  //Sort column with requiredColumn
+	  if(sortBy === 'required'){
+	    for(var c=0; c< columns.length; c++){
+	      if(requiredColumn.indexOf(columns[c]) === -1){
+	        requiredColumn.push(columns[c]);
+	      }
+	    }
+	  }
+	if(sortBy && (sortBy === 'required' || sortBy === 'mandatory')){
+	   columns = requiredColumn;
+	}
+	// console.log('[buildAttrList] columns:');
+	// console.log(columns);
+  
+	return columns;
+}
+var getDescriptionForNodes= function (){
+    var invKeys = Object.keys(INVLIST.INVENTORYLIST);
+    let oxmFile = JSON.parse(OXM);
+    let javaTypes = oxmFile['xml-bindings']['java-types'][0]['java-type'];
+    let nodeDescriptionObj={};
+    let invList = invKeys.map(item => {
+      for (let i = 0; i < javaTypes.length; i++) {
+        if(javaTypes[i]['$']['name'].toLowerCase() === camelToDash(INVLIST.INVENTORYLIST[item].modelPath).toLowerCase()) {
+          if(javaTypes[i]['xml-properties'] !== undefined && javaTypes[i]['xml-properties'][0]['xml-property'] && javaTypes[i]['xml-properties'][0]['xml-property'][0]['$']['name']==='description'){
+            nodeDescriptionObj[INVLIST.INVENTORYLIST[item].modelPath]=javaTypes[i]['xml-properties'][0]['xml-property'][0]['$']['value'];
+          }else{
+            nodeDescriptionObj[INVLIST.INVENTORYLIST[item].modelPath]='';
+          }        
+        }
+      }
+      return nodeDescriptionObj;
+    });
+    return invList;
+}
+
+var generateExcels = function(nodeResults,dslQuery) {
+    console.log('inside generateExcels>>>>>');
+    //Creating New Workbook 
+    var workbook = new Excel.Workbook();
+    var nodesType = [];
+    var worksheet;
+    var columnsJsonObj = {}
+    var columnsList = []
+    columnsJsonObj.columns = columnsList;
+    var nodesLength = nodeResults.length;
+    console.log('nodeResults.length.......',nodesLength);
+    for(var n=0;n<nodesLength;n++){
+      //Creating Sheet for that particular WorkBook 
+      let nodeTypeVal = nodeResults[n]["node-type"];
+      let url = nodeResults[n]["url"];
+      let columns = [];
+      let buildColumns = [];
+      if(nodesType.indexOf(nodeTypeVal) == -1){
+         nodesType.push(nodeTypeVal);
+         worksheet = workbook.addWorksheet(nodeTypeVal,{properties: {showGridLines: true}});
+         buildColumns = buildAttrList(nodeTypeVal, [], 'required');
+         if(dslQuery){
+          let tempDslQuery= dslQuery+',';
+          let nodeTypeProperties ='';
+          let plainNodes ='';
+          var nodePatternwithProp = generateRegexForDsl(nodeTypeVal);
+          var nodeRegularExp = new RegExp(nodePatternwithProp, 'g');
+          plainNodes = tempDslQuery.match(nodeRegularExp);
+          console.log('plainNodes model Gallery null>>>>>*',plainNodes);
+          if(plainNodes){
+            let propertiesPattern ="\\{.*?\\}"; 
+            var propRegularExp = new RegExp(propertiesPattern, 'g');
+            nodeTypeProperties = plainNodes[0].match(propRegularExp); 
+            console.log('nodeTypeProperties model Gallery>>>>>*',nodeTypeProperties);
+            nodeTypeProperties = nodeTypeProperties[0].slice(1,-1).replace(/\'/g,'').toLowerCase().split(',');
+            for(var z=0;z<buildColumns.length;z++){
+                if(nodeTypeProperties.indexOf(buildColumns[z].value.toLowerCase()) !== -1){
+                  columns.push(buildColumns[z]);
+                }
+              }
+              console.log('on condition table columns>>>>',columns);
+            }else{
+              columns=buildColumns;
+            }
+          }else{
+            columns=buildColumns;
+          }
+         columns.push({value: 'uri'});
+         columns.push({value: 'relationship-list'});
+         var column = {
+          [nodeTypeVal] : columns
+        }
+        columnsJsonObj.columns.push(column);
+         if (!worksheet.columns) {
+          worksheet.columns = Object.keys(columns).map((k) => ({ header: columns[k].value, key: columns[k].value, width:15}))
+        }
+      }else{
+        worksheet = workbook.getWorksheet(nodeTypeVal);
+        let col = columnsJsonObj.columns; 
+        for(var c in col){
+          if(col[c][nodeTypeVal]){
+            columns = col[c][nodeTypeVal];
+          }
+        }
+      }      
+      var excelCellsHeader = [];
+      var loop = 0;
+      var noOfCol = Math.ceil(columns.length/26);
+      while(loop<noOfCol){
+        if(loop === 0){
+          for(var j=0; j<EXCELCELLS.length; j++){
+            excelCellsHeader.push(EXCELCELLS[j]);
+          }
+        }else{
+          for(var j=0; j<EXCELCELLS.length; j++){
+            excelCellsHeader.push(EXCELCELLS[loop-1]+EXCELCELLS[j]);
+          }
+        }
+        loop++;
+      }      
+      console.log('excelCellsHeader.......',excelCellsHeader);
+      console.log('worksheet.columns>>>>',worksheet.columns);        
+      var row = [];
+      var relativeRow = [];
+      var rows = [];
+      for(var x in columns){
+        if(nodeResults[n].properties[columns[x].value] !== undefined){
+          row.push(nodeResults[n].properties[columns[x].value]);
+          relativeRow.push("");
+        }else{
+          row.push("");
+          relativeRow.push("");
+        }      
+      }
+      row[row.length-2] = url;
+      console.log('Push Row after>>>>>>>>>>>',row);
+      var relationships = [];
+      if(nodeResults[n]["related-to"]){
+        let relative =nodeResults[n]["related-to"];
+        var relativeLength = relative.length;
+        console.log('relativeLength>>>>>>>>>>>',relativeLength);
+        if(relativeLength>0){
+        for(var r = 0; r<relative.length; r++){
+          var relationship = '';
+          var relationshipLabel = '';
+          var nodeType = '';
+          var localUrl = '';
+          for(var k in relative[r]){
+            let relation = k.toString();
+            if(relation === 'relationship-label'){
+              relationshipLabel = relative[r][k].toString().slice(33);
+            }
+            if(relation === 'node-type'){
+              nodeType = relative[r][k].toString();
+            } 
+            if(relation === 'url'){
+              localUrl = relative[r][k].toString();
+            }       
+          }
+          relationship = 'Relationship ' + relationshipLabel + ' ' + nodeType + ' - ' + localUrl;
+          if(r===0){
+            row[row.length-1] = relationship;
+            rows.push(row);
+          }else{
+            let tempRow = [];
+            tempRow = [...relativeRow]; // cloning in ES6 Way to avoid deep copy
+            tempRow[tempRow.length-1] = relationship;
+            rows.push(tempRow);
+          }     
+        }
+      }else{
+        rows.push(row);
+      }
+      }else{
+        rows.push(row);
+      }
+      console.log('Rows before pushing>>>>>>>>>>>',rows); 
+      let initMergeCell = (n==0) ? 2: worksheet.rowCount + 1;      
+      worksheet.addRows(rows);
+      console.log('initMergeCell>>>>>>',initMergeCell);
+      //worksheet.getColumn(columns.length).values = relationships;      
+      let lastMergeCell = (relativeLength==0)? initMergeCell : initMergeCell + relativeLength - 1;
+      console.log('lastMergeCell>>>>>>',lastMergeCell);
+      for(var x=0;x<columns.length-1;x++){
+        var cell = excelCellsHeader[x] + initMergeCell +':'+excelCellsHeader[x]+lastMergeCell;
+        worksheet.mergeCells(cell);
+      }
+    }
+    var workbookName = 'NodesList_'+nodesLength+'_Results.xlsx';
+    generateWorkbook(workbook,workbookName);
+  }
+  var generateRegexForDsl= function(nodeType){
+    var nodePatternwithProp = nodeType+"\\*\\{.*?\\}\\(.*?\\)[\\,|\\>|\\]|\\)]|"+nodeType+"\\*\\(.*?\\)\\{.*?\\}[\\,|\\>|\\]|\\)]|"+nodeType+"\\{.*?\\}\\(.*?\\)[\\,|\\>|\\]|\\)]|"+nodeType+"\\(.*?\\)\\{.*?\\}[\\,|\\>|\\]|\\)]|"+nodeType+"\\{.*?\\}[\\,|\\>|\\]|\\)]|"+nodeType+"\\*\\{.*?\\}[\\,|\\>|\\]|\\)]";
+		return nodePatternwithProp;
+  }  
+ var generateExcelFromTabularView = function(tabledata,tableheaders,workbookName) {
+   console.log('inside generateExcelFromTabularView>>>>>');
+   //Creating New Workbook
+   var workbook = new Excel.Workbook();
+   var worksheet = workbook.addWorksheet('Results',{properties: {showGridLines: true}});
+   var columns = [];
+   if (!worksheet.columns) {
+     worksheet.columns = Object.keys(tableheaders).map((k) => ({ header: tableheaders[k].name, key: tableheaders[k].name, width:20}))
+   }
+   var rows = [];
+   var row = [];
+   for(var n=0; n<tabledata.length; n++){
+       console.log('TableData<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<',tabledata[n]);
+       row = [];
+       Object.keys(tableheaders).map((k) => { row.push(tabledata[n][tableheaders[k].name])});
+       rows.push(row);
+   }
+   worksheet.addRows(rows);
+   generateWorkbook(workbook,workbookName);
+ }
+ var generateExcelFromTabularViewMultiTabs = function(tabData,tabHeaders,workBookName) {
+   console.log('inside generateExcelFromTabularViewMultiTabs>>>>>');
+   //Creating New Workbook
+   var workbook = new Excel.Workbook();   
+   Object.keys(tabData).forEach((key,index) => {
+        var worksheet = workbook.addWorksheet((index+1)+'_'+key,{properties: {showGridLines: true}});
+        var columns = [];
+        var tableData = tabData[key];
+        var tableHeaders = tabHeaders[key];
+        if (!worksheet.columns) {
+          worksheet.columns = Object.keys(tableHeaders).map((k) => ({ header: tableHeaders[k].name, key: tableHeaders[k].name, width:20}))
+        }
+        var rows = [];
+        var row = [];
+        for(var n = 0; n < tableData.length; n++){
+            console.log('TableData<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<',tableData[n]);
+            row = [];
+            Object.keys(tableHeaders).map((k) => { row.push(tableData[n][tableHeaders[k].name])});
+            rows.push(row);
+        }
+        worksheet.addRows(rows);
+   });
+   generateWorkbook(workbook,workBookName);
+ }
+ var generateViolationExcels = function(tabledata,tableheaders) {
+   generateExcelFromTabularView(tabledata, tableheaders, 'DataIntegrityViolationTable.xlsx');
+ }
+ var generateWorkbook = function(workbook,workbookName){
+   console.log('generateWorkbook :',workbookName);
+    workbook.xlsx.writeBuffer().then(function (data) {
+      const blob = new Blob([data],
+        { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+      const url = window.URL.createObjectURL(blob);
+      const anchor = document.createElement('a');
+      document.body.appendChild(anchor);
+      anchor.href = url;
+      anchor.download = workbookName;
+      anchor.click();
+      window.URL.revokeObjectURL(url);
+    }); 
+  }
+
+
+export const ExportExcel = {
+  buildAttrList : buildAttrList,
+  generateExcels : generateExcels,
+  generateViolationExcels : generateViolationExcels,
+  generateExcelFromTabularView: generateExcelFromTabularView,
+  generateExcelFromTabularViewMultiTabs: generateExcelFromTabularViewMultiTabs,
+  getDescriptionForNodes: getDescriptionForNodes
+};
diff --git a/src/utils/GeneralCommonFunctions.js b/src/utils/GeneralCommonFunctions.js
new file mode 100644
index 0000000..1f2d0e1
--- /dev/null
+++ b/src/utils/GeneralCommonFunctions.js
@@ -0,0 +1,344 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+import {GlobalExtConstants} from 'utils/GlobalExtConstants.js';
+
+let OXM = GlobalExtConstants.OXM;
+
+var scrollTo = function(id) {
+    setTimeout(function () {
+        document.getElementById("main-app-container").scrollTop = document.getElementById(id).offsetTop;
+        }, 100);
+}
+var populatePathDSL = function(tree, isInit, onLoad, enableRealTime){
+    console.log('populatePathDSL>>>>>>> pathFIlter****',tree);
+        var DSL = '';
+    var treeArray = '';
+        var treeArrayLength = 0;
+        if(isInit){
+            treeArray = tree;
+            treeArrayLength = 1;
+        }else{
+            treeArray = tree.children;
+            treeArrayLength = tree.children.length;
+        }
+        for(var k = 0; treeArray && k < treeArrayLength; k++){
+            if(k === 0 && treeArrayLength > 1){
+                DSL += '[';
+            }
+            var node = '';
+            if(isInit){
+                node = tree;
+            }else{
+                node = treeArray[k];
+            }
+            var nodeData=(onLoad)?node:node.data;
+            if(nodeData){
+                console.log('***************',JSON.stringify(nodeData));
+                if(isInit){
+                    DSL += '(>'+nodeData.name;
+                }else{
+                    DSL += nodeData.name;
+                }
+                
+                let propState=false;
+                if(nodeData.details){
+                    var tempAttributeString = '';
+                    var selectedAttributeCount = 0;                    
+                    for (var key in nodeData.details.attrDetails){
+                        if(nodeData.details.attrDetails[key].filterValue && nodeData.details.attrDetails[key].filterValue[0] !==''){
+                            DSL += '(\'' + nodeData.details.attrDetails[key].attributeName + '\',';
+                            let dslValues='';
+                            for(var indx=0; indx<nodeData.details.attrDetails[key].filterValue.length; indx++){                            
+                                dslValues=(indx>0) ? dslValues+',':dslValues;
+                                if(enableRealTime && nodeData.details.attrDetails[key].filterType && nodeData.details.attrDetails[key].filterType[indx]){
+                                    dslValues += nodeData.details.attrDetails[key].filterType[indx]+'(\''+ nodeData.details.attrDetails[key].filterValue[indx] + '\')';                                    
+                                }else{
+                                    dslValues +='\''+nodeData.details.attrDetails[key].filterValue[indx] + '\'';                                    
+                                }                      
+                                if(nodeData.details.attrDetails[key].filterValue.length-1 ===  indx){
+                                    dslValues +=')';
+                                }
+                            }
+                            DSL += dslValues;
+                        }
+                    }
+                }
+            }
+            if(node.children && node.children.length>0){
+                DSL+= '>' + populatePathDSL(node,false,onLoad,enableRealTime);
+            }
+            if(k !==  treeArrayLength - 1){
+                DSL += ',';
+            }
+            if(k === treeArrayLength - 1 && treeArrayLength > 1){
+                DSL += ']';
+            }
+        }
+        if(isInit){
+            DSL+=')';
+        }     
+        return DSL;
+    }
+    var getFilteringOptions = function(nodeType){
+        var propertiesDsl = [];
+        var result = JSON.parse(OXM);
+        var arrayOfTypes = result['xml-bindings']['java-types'][0]['java-type'];
+        //console.dir(arrayOfTypes);
+        var foundIndex = -1;
+        var searchParam = nodeType;
+    
+        if (nodeType.toUpperCase() === 'LINESOFBUSINESS') {
+            searchParam = 'lineOfBusiness';
+        }
+        //console.log('searchParam:' + searchParam);
+        for (var i = 0; i < arrayOfTypes.length && foundIndex === -1; i++) {
+            if (arrayOfTypes[i]['xml-root-element'][0]['$']['name'] === camelToDash(searchParam)) {
+            foundIndex = i;
+            }
+        }
+        if(foundIndex && arrayOfTypes[foundIndex]){
+              //build the filter list
+            for (var j = 0; j < arrayOfTypes[foundIndex]['java-attributes'][0]['xml-element'].length; j++) {
+                let property =  arrayOfTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['$']['name'];            
+                let type = arrayOfTypes[foundIndex]['java-attributes'][0]['xml-element'][j]['$']['type'];
+                if(property !== 'length'){
+                    if (type === 'java.lang.String' || type === 'java.lang.Boolean' || type === 'java.lang.Long' || type === 'java.lang.Integer') {
+                        propertiesDsl[property] = {};
+                        propertiesDsl[property].isSelected = false;
+                        propertiesDsl[property].attributeName = property;
+                        propertiesDsl[property].filterValue = [''];
+                        propertiesDsl[property].filterType = [''];
+                        propertiesDsl[property].dslPath = [];
+                        propertiesDsl[property].dslPathTree = [];
+                    }
+                }
+            }
+            let sortedPropertiesDsl = propertiesDsl.sort(function (filter1, filter2) {
+                if (filter1.attributeName < filter2.attributeName) {
+                    return -1;
+                } else if (filter1.attributeName > filter2.attributeName) {
+                    return 1;
+                } else {
+                    return 0;
+                }
+            });
+            //console.log('FilterList' + JSON.stringify(sortedPropertiesDsl));
+            return sortedPropertiesDsl;
+        }else{
+            return [];
+        }
+    }
+    var getNodeTypes = function(){
+        var result = JSON.parse(OXM);
+        var arrayOfTypes = result['xml-bindings']['java-types'][0]['java-type'];
+        var nodeTypeArray = [];
+        for(var j = 0; j < arrayOfTypes.length; j++){
+            if(arrayOfTypes[j]['xml-root-element'] && arrayOfTypes[j]['xml-root-element'][0]
+                && arrayOfTypes[j]['xml-root-element'][0]['$'] && arrayOfTypes[j]['xml-root-element'][0]['$']['name']){
+                nodeTypeArray.push((arrayOfTypes[j]['xml-root-element'][0]['$']['name']).toLowerCase());
+            }
+        }
+        return nodeTypeArray;
+    }
+    var populateContainer = function(nodeType){
+        var result = JSON.parse(OXM);
+        var arrayOfTypes = result['xml-bindings']['java-types'][0]['java-type'];
+        var isFound = false;
+        var container = '';
+        for (var i = 0; i < arrayOfTypes.length && !isFound; i++) {
+             if(arrayOfTypes[i]['xml-root-element'][0]['$']['name'] === nodeType
+                && arrayOfTypes[i]['xml-properties']
+                && arrayOfTypes[i]['xml-properties'][0]
+                && arrayOfTypes[i]['xml-properties'][0]['xml-property']){
+                        isFound = true;
+                        for(var k = 0; k < arrayOfTypes[i]['xml-properties'][0]['xml-property'].length; k++){
+                            if(arrayOfTypes[i]['xml-properties'][0]['xml-property'][k]['$']['name'] === 'container'){
+                                container = arrayOfTypes[i]['xml-properties'][0]['xml-property'][k]['$']['value'];
+                            }
+                        }
+             }
+        }
+        return container;
+    }
+    var getEditableAttributes = function(nodeType){
+        //get this from the oxm field
+        var result = JSON.parse(OXM);
+        var arrayOfTypes = result['xml-bindings']['java-types'][0]['java-type'];
+        var isFound = false;
+        var uiEditableProps = [];
+        for (var i = 0; i < arrayOfTypes.length && !isFound; i++) {
+             if(arrayOfTypes[i]['xml-root-element'][0]['$']['name'] === nodeType
+                && arrayOfTypes[i]['xml-properties']
+                && arrayOfTypes[i]['xml-properties'][0]
+                && arrayOfTypes[i]['xml-properties'][0]['xml-property']){
+                        isFound = true;
+                        for(var k = 0; k < arrayOfTypes[i]['xml-properties'][0]['xml-property'].length; k++){
+                            if(arrayOfTypes[i]['xml-properties'][0]['xml-property'][k]['$']['name'] === 'uiEditableProps'){
+                                uiEditableProps = ((arrayOfTypes[i]['xml-properties'][0]['xml-property'][k]['$']['value']).replace(/\s/g,"")).split(',');
+                            }
+                        }
+             }
+        }
+        return uiEditableProps;
+    }
+    var populateEdgeRules = function(nodeType,edgeRules){
+        var nodeDetails = [];
+        var node = null;
+        console.log('populateEdgeRules.nodeType: ' + nodeType);
+        var id = generateID();
+        for (var i = 0; i < edgeRules.length; i++) {
+            var ruleObj = edgeRules[i];
+            if (ruleObj.from === nodeType && !nodeDetails[ruleObj.to + id]) {
+                node = ruleObj.to + id;
+                if(!nodeDetails[node]){
+                  nodeDetails[node] = {};
+                  nodeDetails[node].nodeType = ruleObj.to;
+                  nodeDetails[node].isSelected = false;
+                  nodeDetails[node].attrDetails = GeneralCommonFunctions.getFilteringOptions(ruleObj.to);
+                  nodeDetails[node].parentContainer = GeneralCommonFunctions.populateContainer(ruleObj.to);
+              }
+            }
+            if (ruleObj.to === nodeType && !nodeDetails[ruleObj.from + id]) {
+                node = ruleObj.from + id;
+                if(!nodeDetails[node]){
+                  nodeDetails[node] = {};
+                  nodeDetails[node].nodeType = ruleObj.from;
+                  nodeDetails[node].isSelected = false;
+                  nodeDetails[node].attrDetails = GeneralCommonFunctions.getFilteringOptions(ruleObj.from);
+                  nodeDetails[node].parentContainer = GeneralCommonFunctions.populateContainer(ruleObj.from);
+              }
+            }
+        }
+        let nodesSorted = nodeDetails.sort(function (filter1, filter2) {
+            if (filter1.nodeType < filter2.nodeType) {
+                return -1;
+            } else if (filter1.nodeType > filter2.nodeType) {
+                return 1;
+            } else {
+                return 0;
+            }
+        });
+        console.log('EdgeRulesList' + JSON.stringify(nodesSorted));
+        nodeDetails = nodesSorted;
+        return nodeDetails;
+    }
+var camelToDash = function(str){
+    return (str.replace(/\W+/g, '-')
+    .replace(/([a-z\d])([A-Z])/g, '$1-$2')).toLowerCase();
+}
+var  generateID = function(){
+    return Math.random().toString().replace('0.', '');
+}
+var extractNodeDetails = function(node, isRoot, errorFunction, isAperture){
+  let nodeType =  node['node-type'];
+  let nodeData = {
+      "name": nodeType,
+      "id": nodeType,
+      "children": [],
+      "details":{}
+  }
+  nodeData.details.includeInOutput = node.store;
+  nodeData.details.isSelected = true;
+  nodeData.details.isRootNode = isRoot;
+  nodeData.details.nodeType = nodeType;
+  var attributes = GeneralCommonFunctions.getFilteringOptions(nodeType);
+  nodeData.details.attrDetails = attributes;
+  nodeData.details.parentContainer = GeneralCommonFunctions.populateContainer(nodeType);
+  if(node.store && !node['requested-props']){
+      for(var key in nodeData.details.attrDetails){
+          nodeData.details.attrDetails[key].isSelected = true;
+      }
+  }else if (node.store && node['requested-props']){
+       for(var key in node['requested-props']){
+           nodeData.details.attrDetails[key].isSelected = true;
+       }
+  }
+  var isValid = true;
+  for (var x in node['node-filter']){
+      if(isValid){
+          for (var y in node['node-filter'][x]) {
+              if(isValid){
+                  var attrKey = node['node-filter'][x][y]['key'];
+                  var filter = node['node-filter'][x][y]['filter'];
+                  //If aperture is not turned on and query loaded uses anything besides EQ throw error
+                  //when merged with calls from builder use condition to enable this
+                  /*if(!isAperture && filter !== 'EQ'){
+                      errorFunction(null, "invalidQuery");
+                      isValid = false;
+                  }*/
+                  if(!nodeData.details.attrDetails[attrKey]){
+                      nodeData.details.attrDetails[attrKey] = {};
+                  }
+                  if(nodeData.details.attrDetails[attrKey].filterType.length > 0 && nodeData.details.attrDetails[attrKey].filterType[0] === ''){
+                      nodeData.details.attrDetails[attrKey].filterType = [];
+                  }
+                  if(nodeData.details.attrDetails[attrKey].filterValue.length > 0 && nodeData.details.attrDetails[attrKey].filterValue[0] === ''){
+                      nodeData.details.attrDetails[attrKey].filterValue = [];
+                  }
+
+                  if(node['node-filter'][x][y]['value'][0]){
+                      for (var i in node['node-filter'][x][y]['value']){
+                          nodeData.details.attrDetails[attrKey].filterType.push(filter);
+                          nodeData.details.attrDetails[attrKey].filterValue.push(node['node-filter'][x][y]['value'][i]);
+                      }
+                      if(!nodeData.details.attrDetails[attrKey].attributeName){
+                          nodeData.details.attrDetails[attrKey].attributeName = attrKey;
+                      }
+                  }else{
+                      //if a filter had no values associated to it do nothing
+                      //when merged with calls from builder use condition to enable this
+                      /* errorFunction(null, "invalidQuery");
+                      isValid = false; */
+                  }
+              }
+          }
+      }
+  }
+  var initWhereNode = null;
+  if(node['where-filter'].length > 0){
+      for(var index in node['where-filter']){
+          initWhereNode = GeneralCommonFunctions.extractNodeDetails(node['where-filter'][index].children[0], true);
+      }
+  }
+  if(initWhereNode){
+      nodeData.details.dslPath=[];
+      nodeData.details.dslPathTree=[];
+      nodeData.details.dslPathTree.push(initWhereNode);
+  }
+  if(node.children.length > 0){
+      for(var i = 0; i < node.children.length; i++){
+          nodeData.children[i] = GeneralCommonFunctions.extractNodeDetails(node.children[i], false);
+      }
+  }
+  return nodeData;
+}
+export const GeneralCommonFunctions = {
+    scrollTo: scrollTo,
+    populatePathDSL: populatePathDSL,
+    getFilteringOptions: getFilteringOptions,
+    getNodeTypes: getNodeTypes,
+    populateContainer: populateContainer,
+    populateEdgeRules: populateEdgeRules,
+    camelToDash: camelToDash,
+    generateID: generateID,
+    extractNodeDetails: extractNodeDetails,
+    getEditableAttributes: getEditableAttributes
+};
diff --git a/src/utils/GlobalConstants.js b/src/utils/GlobalConstants.js
index 56de6eb..e3ce2a9 100644
--- a/src/utils/GlobalConstants.js
+++ b/src/utils/GlobalConstants.js
@@ -40,4 +40,22 @@ export const STATUS_CODE_5XX_SERVER_ERROR = 500;
 
 export const filterBarActionTypes = keyMirror(FilterBarConstants.FILTER_BAR_ACTION_TYPES);
 
-export const UNIFIED_FILTERS_URL = BASE_URL + '/rest/search/unifiedFilterRequest';
\ No newline at end of file
+export const UNIFIED_FILTERS_URL = BASE_URL + '/rest/search/unifiedFilterRequest';
+
+var url = window.location.href;
+var environment = '';
+var APP_TITLE_REGX = '\/services\/(\\w+)';
+var APP_TITLE_REGX_LOCAL = '\/(\\w+)/#';
+if(url.includes('localhost')){
+  var regTitle = new RegExp(APP_TITLE_REGX_LOCAL);
+  environment = url.match(regTitle)[1].toUpperCase() + '_LOCALHOST_';
+}else if (url.includes('ecompc_')){
+  environment = url.split('/')[3] + '_';
+}else{
+  var regTitle = new RegExp(APP_TITLE_REGX);
+  environment = url.match(regTitle)[1].toUpperCase() + '_NON_WEBJUNCTION_';
+}
+
+export const ENVIRONMENT = environment;
+
+
diff --git a/src/utils/GlobalExtConstants.js b/src/utils/GlobalExtConstants.js
new file mode 100644
index 0000000..3a5f223
--- /dev/null
+++ b/src/utils/GlobalExtConstants.js
@@ -0,0 +1,110 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+
+const appConfigJson = require('app/assets/configuration/app_config.json');
+const BACKEND_IP_ADDRESS = document.location.hostname;
+const BACKEND_PORT_NUMBER = window.location.port;
+const PROTOCOL = window.location.protocol;
+var url = window.location.href;
+var environment = '';
+if(url.includes('localhost')){
+  var regTitle = new RegExp(appConfigJson.APP_TITLE_REGX_LOCAL);
+  environment = url.match(regTitle)[1].toUpperCase() + '_LOCALHOST_';
+}else if (url.includes('ecompc_')){
+  environment = url.split('/')[3] + '_';
+}else{
+  var regTitle = new RegExp(appConfigJson.APP_TITLE_REGX);
+  environment = url.match(regTitle)[1].toUpperCase() + '_NON_WEBJUNCTION_';
+}
+
+let pathNameVar = sessionStorage.getItem(environment + 'PAGE_TITLE');
+let apertureService = JSON.parse(sessionStorage.getItem(environment + 'APERTURE_SERVICE'));
+console.log('GlobalExtConstants apertureService************',apertureService);
+if (!pathNameVar || pathNameVar === '' || pathNameVar === null) {
+  if(url.includes('localhost')){
+    var regTitle = new RegExp(appConfigJson.APP_TITLE_REGX_LOCAL);
+    sessionStorage.setItem(environment + 'PAGE_TITLE',url.match(regTitle)[1].toUpperCase());
+  }else{
+    var regTitle = new RegExp(appConfigJson.APP_TITLE_REGX);
+    sessionStorage.setItem(environment + 'PAGE_TITLE',url.match(regTitle)[1].toUpperCase());
+  }
+}
+
+console.log('sessionStorage.getItem(PAGE_TITLE)>>>>>',sessionStorage.getItem(environment + 'PAGE_TITLE'));
+pathNameVar = sessionStorage.getItem(environment + 'PAGE_TITLE').toLowerCase();
+if(pathNameVar === 'a&ai'){
+  pathNameVar = 'aai';
+}
+const appName = appConfigJson[pathNameVar.toUpperCase()];
+const inventoryList =  require('app/assets/configuration/' + pathNameVar + '/' + appName.INVLIST);
+
+var base = '';
+var url = window.location.href;
+if(url.includes('ecompc_')){
+  base = PROTOCOL + '//' + BACKEND_IP_ADDRESS + '/' + url.split('/')[3];
+}else{
+  base = PROTOCOL + '//' + BACKEND_IP_ADDRESS + ':' + BACKEND_PORT_NUMBER;
+}
+const baseURL = base;
+
+var overrideDomain = baseURL;
+if(inventoryList.NODESERVER){
+  overrideDomain = 'https://' + inventoryList.NODESERVER;
+}
+/*
+REGEX - will use the REGEXP operation
+EQ
+CONTAINS - will use the LIKE operation in mysql (case insensitive by default)
+STARTS_WITH - will use the LIKE operation in mysql (case insensitive by default)
+ENDS_WITH - will use the LIKE operation in mysql (case insensitive by default)
+GT
+LT
+GTE
+LTE
+*/
+
+
+var filterTypeList = ['EQ','NEQ','CONTAINS','NOT_CONTAINS','STARTS_WITH','NOT_STARTS_WITH','ENDS_WITH','NOT_ENDS_WITH','GT','LT','GTE','LTE','REGEX','NOT_REGEX'];
+var tabularFilterType = (apertureService) ? 'CONTAINS' : '=';
+var uriDelimiter = '*';
+
+
+export const GlobalExtConstants = {
+  TITLE : appName.TITLE,
+  ENVIRONMENT : environment,
+  PATHNAME : pathNameVar,
+  BASE_URL : baseURL,
+  OVERRIDE_DOMAIN: overrideDomain,
+  CUSTOMQUERYLIST :  require('app/assets/configuration/' + pathNameVar + '/' + appName.CUSTQUERYLIST),
+  INVLIST : inventoryList,
+  EDGERULES : require('app/assets/configuration/' + pathNameVar + '/dbedgeRules.json'),
+  OXM : JSON.stringify(require('app/assets/configuration/' + pathNameVar + '/' + appName.OXM)),
+  COLOR_BLUE : '#009fdb',
+  PAGINATION_CONSTANT : { RESULTS_PER_PAGE : 50 , PAGE_RANGE_DISPLAY : 10},
+  DOWNLOAD_ALL : 500,
+  EXCELCELLS : ['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'],
+  DOWNLOAD_TOOLTIP : 'Downloads Current Page Results',
+  APERTURE_SERVICE : apertureService,
+  FILTER_TYPES: filterTypeList,
+  TABULAR_FILTER_TYPE: tabularFilterType,
+  URI_DELIMITCHAR: uriDelimiter,
+  EMAIL_EXT: '@test.com'
+};
diff --git a/src/utils/OxmUtility.js b/src/utils/OxmUtility.js
new file mode 100644
index 0000000..513ee42
--- /dev/null
+++ b/src/utils/OxmUtility.js
@@ -0,0 +1,28 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+/*import {PATHNAME} from './GlobalExtConstants.js';
+
+export function loadOxmFile() {
+  if (!sessionStorage.getItem('oxmFile')) {
+    console.log('[LoadOxmFile] sending request to oxm file');
+    const aaiOxm = require('../assets/configuration/' + PATHNAME  + '/oxm.xml');
+    sessionStorage.setItem('oxmFile', JSON.stringify(aaiOxm));
+  }
+}*/
diff --git a/src/utils/Routes.js b/src/utils/Routes.js
index 3d1b4cf..8130671 100644
--- a/src/utils/Routes.js
+++ b/src/utils/Routes.js
@@ -18,8 +18,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-import {encrypt } from './Crypto.js';
-import { decrypt } from '../utils/Crypto.js';
+import {encrypt, decrypt } from './Crypto.js';
 
 
 export function changeUrlAddress(pathObj, historyObj) {
diff --git a/src/utils/SpinnerContainer.jsx b/src/utils/SpinnerContainer.jsx
index 17e6e58..648a2e4 100644
--- a/src/utils/SpinnerContainer.jsx
+++ b/src/utils/SpinnerContainer.jsx
@@ -19,16 +19,17 @@
  * ============LICENSE_END=========================================================
  */
 import React, { Component } from 'react';
-import { PropTypes } from 'prop-types';
 import { ClipLoader } from 'react-spinners';
-import {COLOR_BLUE} from 'utils/GlobalConstants.js';
+import {COLOR_BLUE} from './GlobalExtConstants.js';
+import { PropTypes } from 'prop-types';
 
 class SpinnerContainer extends Component {
   render() {
     // if loading, show content as busy (ex: grey out)
-    const spinnerContentClass = this.props.loading ? 'spin-content' : '';
+    const spinnerContentClass = this.props.loading ? 'spinner-content' : '';
+    const containerClass = this.props.fullscreen ? 'col-lg-12 spinner-container' : 'spinner-container';
     return (
-      <div className='spin-container'>
+      <div className={containerClass}>
         <div className='spinner'>
           <ClipLoader color={COLOR_BLUE} loading={this.props.loading} />
         </div>
diff --git a/webpack.config.js b/webpack.config.js
index 7d2e53a..894594a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -32,6 +32,11 @@ module.exports = {
       'webpack/hot/only-dev-server'
     ]
   },
+  externals: [
+      {
+        xmlhttprequest: 'XMLHttpRequest'
+      }
+  ],
   output: {
     path: path.join(__dirname, 'dist'),
     publicPath: ``,
@@ -56,7 +61,7 @@ module.exports = {
   },
   module: {
     loaders: [
-      {test: /\.(js|jsx)$/, loaders: ['babel-loader', 'eslint-loader'], exclude: /node_modules/},
+      {test: /\.(js|jsx)$/, loaders: ['babel-loader'], exclude: /node_modules/},
       {test: /\.(css|scss)$/, loaders: ['style', 'css?sourceMap', 'sass?sourceMap']},
       // required for font icons
       {test: /\.(woff|woff2|ttf|eot|otf)(\?.*)?$/, loader: 'url-loader?limit=163840&mimetype=application/font-woff&name=[name].[ext]'},
@@ -67,8 +72,8 @@ module.exports = {
   },
   eslint: {
     configFile: './.eslintrc',
-    failOnError: true,
-    emitError: true,
+    failOnError: false,
+    emitError: false,
     emitWarning: true
   },
   plugins: [
diff --git a/webpack.devConfig.js b/webpack.devConfig.js
index 9e58faf..232e541 100644
--- a/webpack.devConfig.js
+++ b/webpack.devConfig.js
@@ -33,9 +33,14 @@ module.exports = {
       'webpack/hot/only-dev-server'
     ]
   },
+  externals: [
+      {
+        xmlhttprequest: 'XMLHttpRequest'
+      }
+   ],
   output: {
-    path: path.join(__dirname, 'dist'),
-    publicPath: ``,
+    path: path.join(__dirname, 'dist/aai'),
+    publicPath: 'https://localhost:8001/',
     filename: '[name].js',
     sourceMapFilename: '[name].js.map'
   },
@@ -51,6 +56,7 @@ module.exports = {
   },
   devServer: {
     port: devPort,
+    disableHostCheck: true,
     historyApiFallback: true,
     publicPath: ``,
     contentBase: path.join(__dirname, 'dist'),
@@ -65,7 +71,7 @@ module.exports = {
   },
   module: {
     loaders: [
-      {test: /\.(js|jsx)$/, loaders: ['babel-loader', 'eslint-loader'], exclude: /node_modules/},
+      {test: /\.(js|jsx)$/, loaders: ['babel-loader'], exclude: /node_modules/},
       {test: /\.(css|scss)$/, loaders: ['style-loader', 'css-loader', 'sass-loader']},
       // required for font icons
       {test: /\.(woff|woff2|ttf|eot|otf)(\?.*)?$/, loader: 'url-loader?limit=163840&mimetype=application/font-woff&name=[name].[ext]'},
@@ -76,7 +82,8 @@ module.exports = {
   },
   eslint: {
     configFile: './.eslintrc',
-    emitError: true,
+    failOnError: false,
+    emitError: false,
     emitWarning: true
   },
   plugins: [